From: Martin Ågren <martin.agren@gmail.com>
Date: Wed, 28 Feb 2018 19:07:56 +0000 (+0100)
Subject: merge-recursive: always roll back lock in `merge_recursive_generic()`
X-Git-Tag: v2.17.0-rc0~16^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/51d3f43d2fd7f93cd19494eef4aef712fad597c2?ds=inline;hp=--cc

merge-recursive: always roll back lock in `merge_recursive_generic()`

If we return early, or if `active_cache_changed` is false, we forget to
roll back the lockfile.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

51d3f43d2fd7f93cd19494eef4aef712fad597c2
diff --git a/merge-recursive.c b/merge-recursive.c
index 6ff971f9a2..129577987b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2218,12 +2218,15 @@ int merge_recursive_generic(struct merge_options *o,
 	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
 	clean = merge_recursive(o, head_commit, next_commit, ca,
 			result);
-	if (clean < 0)
+	if (clean < 0) {
+		rollback_lock_file(&lock);
 		return clean;
+	}
 
 	if (active_cache_changed &&
 	    write_locked_index(&the_index, &lock, COMMIT_LOCK))
 		return err(o, _("Unable to write index."));
+	rollback_lock_file(&lock);
 
 	return clean ? 0 : 1;
 }