diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:16 -0700 |
| commit | 149971badc562f4e5ee66c045f40c904fb29eab6 (patch) | |
| tree | 020dbffb91e75d4a001bffe52c804018ca2f1e66 /builtin/commit.c | |
| parent | 4d46ee74e11416e7edf6624611242fe2f98f078c (diff) | |
| parent | 483fbe2b7cb89ddcf700a677735d21aa176bc5a6 (diff) | |
| download | git-149971badc562f4e5ee66c045f40c904fb29eab6.tar.gz | |
Merge branch 'jc/index-update-if-able'
* jc/index-update-if-able:
update $GIT_INDEX_FILE when there are racily clean entries
diff/status: refactor opportunistic index update
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 3979b823ef..54b20497b1 100644 --- 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; |