Merge branch 'rs/blame'

diff --git a/rerere.c b/rerere.c
index 8e5532b1ff96a88133d837b9a29fa78117c36abd..02931a151f1abe183763c9a1edb65ffd36d83bc3 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -351,7 +351,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);