Merge branch 'jc/index-update-if-able'

[git.git] / builtin / commit.c

diff --git a/builtin/commit.c b/builtin/commit.c
index 3979b823ef4227aac641be48c47581c56423b9d7..54b20497b120bc2bf5ee6e4904eca0ca5d83ff4f 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1203,13 +1203,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
 
        fd = hold_locked_index(&index_lock, 0);
-       if (0 <= fd) {
-               if (active_cache_changed &&
-                   !write_cache(fd, active_cache, active_nr))
-                       commit_locked_index(&index_lock);
-               else
-                       rollback_lock_file(&index_lock);
-       }
+       if (0 <= fd)
+               update_index_if_able(&the_index, &index_lock);
 
        s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
        s.ignore_submodule_arg = ignore_submodule_arg;