diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:33:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:33:05 -0700 |
| commit | 44ec754dc766e38684d9ad4563019378730eea82 (patch) | |
| tree | e8be72b52ab4827a58dc72518dbc5068313931f1 /builtin | |
| parent | be57695d77c4303798796510585618c57e1bba63 (diff) | |
| parent | 483fbe2b7cb89ddcf700a677735d21aa176bc5a6 (diff) | |
| download | git-44ec754dc766e38684d9ad4563019378730eea82.tar.gz | |
Merge branch 'jc/index-update-if-able' into maint
* 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')
| -rw-r--r-- | builtin/commit.c | 9 | ||||
| -rw-r--r-- | builtin/diff.c | 7 |
2 files changed, 3 insertions, 13 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index d71e1e0c9c..6e32166a29 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1131,13 +1131,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.in_merge = in_merge; diff --git a/builtin/diff.c b/builtin/diff.c index 42822cd537..d4d80c982e 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -197,12 +197,7 @@ static void refresh_index_quietly(void) discard_cache(); read_cache(); refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED); - - if (active_cache_changed && - !write_cache(fd, active_cache, active_nr)) - commit_locked_index(lock_file); - - rollback_lock_file(lock_file); + update_index_if_able(&the_index, lock_file); } static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv) |