X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=2b7a99d729e13b09239f1d9175d3d6c0048821b0;hb=581000a4196d196d221bb6164a49a8a52ce30730;hp=323e493dafee46c0d3f95e3c4cd9c4c9b463bbef;hpb=ac39efbdf3d41443c40166b7578b7fb87c2f3b60;p=git.git

diff --git a/rerere.c b/rerere.c
index 323e493da..2b7a99d72 100644
--- a/rerere.c
+++ b/rerere.c
@@ -346,7 +346,8 @@ int setup_rerere(struct string_list *merge_rr)
 		return -1;
 
 	merge_rr_path = xstrdup(git_path("MERGE_RR"));
-	fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
+	fd = hold_lock_file_for_update(&write_lock, merge_rr_path,
+				       LOCK_DIE_ON_ERROR);
 	read_rr(merge_rr);
 	return fd;
 }