X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=a0d477aaca73ff7ec8b12dc6c8255b69dbd677a5;hb=8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0;hp=323e493dafee46c0d3f95e3c4cd9c4c9b463bbef;hpb=57b0fc4516249e1aa86169718d148fbf2940dc0c;p=git.git

diff --git a/rerere.c b/rerere.c
index 323e493da..a0d477aac 100644
--- a/rerere.c
+++ b/rerere.c
@@ -345,8 +345,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;
 }