Merge branch 'sb/submodule-rm-absorb'

diff --git a/read-cache.c b/read-cache.c
index c27d3e240b06fc75fd2deac190a764fce28ed059..2eca639cce3a084286418d56f2b48a4303c18dd7 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1418,12 +1418,9 @@ static int read_index_extension(struct index_state *istate,
        return 0;
 }
 
-int hold_locked_index(struct lock_file *lk, int die_on_error)
+int hold_locked_index(struct lock_file *lk, int lock_flags)
 {
-       return hold_lock_file_for_update(lk, get_index_file(),
-                                        die_on_error
-                                        ? LOCK_DIE_ON_ERROR
-                                        : 0);
+       return hold_lock_file_for_update(lk, get_index_file(), lock_flags);
 }
 
 int read_index(struct index_state *istate)