git-checkout.txt: clarify that <branch> applies when no path is given.

[git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index 2b7a99d729e13b09239f1d9175d3d6c0048821b0..a0d477aaca73ff7ec8b12dc6c8255b69dbd677a5 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -345,7 +345,7 @@ int setup_rerere(struct string_list *merge_rr)
        if (!is_rerere_enabled())
                return -1;
 
-       merge_rr_path = xstrdup(git_path("MERGE_RR"));
+       merge_rr_path = git_pathdup("MERGE_RR");
        fd = hold_lock_file_for_update(&write_lock, merge_rr_path,
                                       LOCK_DIE_ON_ERROR);
        read_rr(merge_rr);