summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-26 20:13:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-26 20:13:16 -0700
commit149971badc562f4e5ee66c045f40c904fb29eab6 (patch)
tree020dbffb91e75d4a001bffe52c804018ca2f1e66 /builtin
parentMerge branch 'jk/checkout-orphan-warning' (diff)
parentupdate $GIT_INDEX_FILE when there are racily clean entries (diff)
downloadtgif-149971badc562f4e5ee66c045f40c904fb29eab6.tar.xz
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')
-rw-r--r--builtin/commit.c9
-rw-r--r--builtin/diff.c7
2 files changed, 3 insertions, 13 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;
diff --git a/builtin/diff.c b/builtin/diff.c
index 4c9deb28ec..655a013ed0 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)