diff options
| author | Chris Johnsen <chris_johnsen@pobox.com> | 2009-03-07 03:30:51 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-07 12:21:45 -0800 |
| commit | 0d66e95903a5c2567baa61cc7299ce865abe41b1 (patch) | |
| tree | 26c62d92b9306e50411587229c561b6f2d7f26c2 /builtin-revert.c | |
| parent | dcc901bc2926f92558a854430570123b4152451d (diff) | |
| download | git-0d66e95903a5c2567baa61cc7299ce865abe41b1.tar.gz | |
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 <chris_johnsen@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-revert.c')
| -rw-r--r-- | builtin-revert.c | 1 |
1 files changed, 1 insertions, 0 deletions
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"); |