hold_locked_index(): align error handling with hold_lockfile_for_update()

diff --git a/sequencer.c b/sequencer.c
index 30b10ba143959bf2618872427f730a9f0e30d369..7fc1e2a5df0ada4816dc3de97e8f6139fbabe635 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -370,7 +370,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        char **xopt;
        static struct lock_file index_lock;
 
-       hold_locked_index(&index_lock, 1);
+       hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 
        read_cache();