Merge branch 'maint'

diff --git a/builtin-commit.c b/builtin-commit.c
index 717eb18da0e0cbe901dd8a660649388ccc0a24e1..ff6ea0d85eebdd0b815f33b9b1ef0df8d1885988 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -317,6 +317,10 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
        if (write_cache(fd, active_cache, active_nr) ||
            close_lock_file(&false_lock))
                die("unable to write temporary index file");
+
+       discard_cache();
+       read_cache_from(false_lock.filename);
+
        return false_lock.filename;
 }