X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=02931a151f1abe183763c9a1edb65ffd36d83bc3;hb=6e13921b4f7adcc7316a76c0c4955b85b1589a65;hp=5bb5316cdae16154fd4aaffe996710c0bcfc0b94;hpb=f4a75a416f62c0494e06cb42a11c7cc70ec9303e;p=git.git

diff --git a/rerere.c b/rerere.c
index 5bb5316cd..02931a151 100644
--- a/rerere.c
+++ b/rerere.c
@@ -351,8 +351,9 @@ int setup_rerere(struct string_list *merge_rr)
 	if (!is_rerere_enabled())
 		return -1;
 
-	merge_rr_path = xstrdup(git_path("MERGE_RR"));
-	fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
+	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);
 	return fd;
 }