Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
oidmap: ensure map is initialized
[gitweb.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index 2882d5312078e6e732bb2167db6849609fedd6af..5e09b5d34fbcb0516ffdaf6a841a6a8ff47f4ea5 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-438,7
+438,8
@@
static int do_recursive_merge(struct commit *base, struct commit *next,
char **xopt;
static struct lock_file index_lock;
- hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
+ if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
+ return -1;
read_cache();