From 0d66e95903a5c2567baa61cc7299ce865abe41b1 Mon Sep 17 00:00:00 2001 From: Chris Johnsen Date: Sat, 7 Mar 2009 03:30:51 -0600 Subject: builtin-revert.c: release index lock when cherry-picking an empty commit When a cherry-pick of an empty commit is done, release the lock held on the index. The fix is the same as was applied to similar code in 4271666046. Signed-off-by: Chris Johnsen Signed-off-by: Junio C Hamano --- builtin-revert.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin-revert.c') diff --git a/builtin-revert.c b/builtin-revert.c index d48313c745..09d08fa3e3 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -387,6 +387,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) (write_cache(index_fd, active_cache, active_nr) || commit_locked_index(&index_lock))) die("%s: Unable to write new index file", me); + rollback_lock_file(&index_lock); if (!clean) { add_to_msg("\nConflicts:\n\n"); -- cgit v1.2.3