Merge branch 'dl/xdiff'

diff --git a/builtin-commit.c b/builtin-commit.c
index 33b659edce478fb0d3d4bb723e4f54c13db0efb1..93ca49635731942c72cb52b27b1a6ba53becd1ca 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -320,7 +320,9 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
                die("unable to write new_index file");
 
        fd = hold_lock_file_for_update(&false_lock,
-                                      git_path("next-index-%"PRIuMAX, (uintmax_t) getpid()), 1);
+                                      git_path("next-index-%"PRIuMAX,
+                                               (uintmax_t) getpid()),
+                                      LOCK_DIE_ON_ERROR);
 
        create_base_index();
        add_remove_files(&partial);