From 6481652432eed5b073428411763d5b5d712b6745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Tue, 27 Feb 2018 22:30:10 +0100 Subject: [PATCH] sequencer: always roll back lock in `do_recursive_merge()` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we return early, we forget to roll back the lockfile. Do so. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index d9f865926d..bca6922823 100644 --- a/sequencer.c +++ b/sequencer.c @@ -514,8 +514,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))