diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2018-02-27 21:30:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 22:48:17 (GMT) |
| commit | 6481652432eed5b073428411763d5b5d712b6745 (patch) | |
| tree | d993ff549a34af52bc2baa3c2ac187bf134d147a /sequencer.c | |
| parent | 14bca6c63cec3bd6e9b636fd1ff5b0ea2bd5edce (diff) | |
| download | git-6481652432eed5b073428411763d5b5d712b6745.zip git-6481652432eed5b073428411763d5b5d712b6745.tar.gz git-6481652432eed5b073428411763d5b5d712b6745.tar.bz2 | |
sequencer: always roll back lock in `do_recursive_merge()`
If we return early, we forget to roll back the lockfile. Do so.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index d9f8659..bca6922 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)) |