diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
| commit | 934f788981de941814e821217f32451a5c715d5d (patch) | |
| tree | b98d42ef8c9606b34f9b9389d2d65190db1ecc37 /builtin-revert.c | |
| parent | 113106e06c48cc80432fd1be8af912898e8f240e (diff) | |
| parent | 9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (diff) | |
Merge branch 'maint'
* maint:
builtin-revert.c: release index lock when cherry-picking an empty commit
document config --bool-or-int
t1300: use test_must_fail as appropriate
cleanup: add isascii()
Documentation: fix badly indented paragraphs in "--bisect-all" description
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 d210150671..3f2614e1bb 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -376,6 +376,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"); |