[PATCH 2/5] sequencer: always roll back lock in `do_recursive_merge()`
From: Martin Ågren <hidden>
Date: 2018-02-27 21:30:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
If we return early, we forget to roll back the lockfile. Do so. Signed-off-by: Martin Ågren <redacted> --- sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 90807c4559..e6bac4692a 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -465,8 +465,10 @@ static int do_recursive_merge(struct commit *base, struct commit *next, fputs(o.obuf.buf, stdout); strbuf_release(&o.obuf); diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0); - if (clean < 0) + if (clean < 0) { + rollback_lock_file(&index_lock); return clean; + } if (active_cache_changed && write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
--
2.16.2.246.ga4ee44448f