Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
test-lib: Replace uses of $(expr ...) by POSIX shell features.
[gitweb.git]
/
builtin-revert.c
diff --git
a/builtin-revert.c
b/builtin-revert.c
index d210150671830c10f098463175e5a6e8d304c1a4..3f2614e1bbef009afadefff7d284225533db2a09 100644
(file)
--- 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");