summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-03 19:33:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-03 19:33:05 (GMT)
commit44ec754dc766e38684d9ad4563019378730eea82 (patch)
treee8be72b52ab4827a58dc72518dbc5068313931f1 /read-cache.c
parentbe57695d77c4303798796510585618c57e1bba63 (diff)
parent483fbe2b7cb89ddcf700a677735d21aa176bc5a6 (diff)
downloadgit-44ec754dc766e38684d9ad4563019378730eea82.zip
git-44ec754dc766e38684d9ad4563019378730eea82.tar.gz
git-44ec754dc766e38684d9ad4563019378730eea82.tar.bz2
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 'read-cache.c')
-rw-r--r--read-cache.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 4f2e890..0480d94 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1568,6 +1568,31 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
return result;
}
+static int has_racy_timestamp(struct index_state *istate)
+{
+ int entries = istate->cache_nr;
+ int i;
+
+ for (i = 0; i < entries; i++) {
+ struct cache_entry *ce = istate->cache[i];
+ if (is_racy_timestamp(istate, ce))
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Opportunisticly update the index but do not complain if we can't
+ */
+void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
+{
+ if ((istate->cache_changed || has_racy_timestamp(istate)) &&
+ !write_index(istate, lockfile->fd))
+ commit_locked_index(lockfile);
+ else
+ rollback_lock_file(lockfile);
+}
+
int write_index(struct index_state *istate, int newfd)
{
git_SHA_CTX c;