Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1

diff --git a/builtin-revert.c b/builtin-revert.c
index d48313c7453c24e7ab4cbb3e024d05ec311edf7b..09d08fa3e3dd45b3bbb1ded4776da6bfb546a43d 100644 (file)
--- 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");