X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=8e5532b1ff96a88133d837b9a29fa78117c36abd;hb=158629b2c9baffd0352306bd8dfa0784c981955d;hp=5bb5316cdae16154fd4aaffe996710c0bcfc0b94;hpb=20341dd970b331fd721225ca630548ec1e90d8a5;p=git.git

diff --git a/rerere.c b/rerere.c
index 5bb5316cd..8e5532b1f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -352,7 +352,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;
 }