X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=02931a151f1abe183763c9a1edb65ffd36d83bc3;hb=6e13921b4f7adcc7316a76c0c4955b85b1589a65;hp=8e5532b1ff96a88133d837b9a29fa78117c36abd;hpb=d95f91d9e48a88a39ac2de5bfddd9d33fd36435d;p=git.git diff --git a/rerere.c b/rerere.c index 8e5532b1f..02931a151 100644 --- 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);