author | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:33:05 +0000 (12:33 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:33:05 +0000 (12:33 -0700) |
* jc/index-update-if-able:
update $GIT_INDEX_FILE when there are racily clean entries
diff/status: refactor opportunistic index update
update $GIT_INDEX_FILE when there are racily clean entries
diff/status: refactor opportunistic index update
builtin/commit.c | patch | blob | history | |
builtin/diff.c | patch | blob | history | |
cache.h | patch | blob | history | |
read-cache.c | patch | blob | history |
diff --git a/builtin/commit.c b/builtin/commit.c
index d71e1e0c9c27c4d03cd02b4deaacec67af33917a..6e32166a297d2e8783e9a24dee6398bb0aa28e98 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
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 42822cd5374dbcf0e63c17078a55284c432ddc77..d4d80c982e99f9a16e4e5228a963d1f2f1836bfb 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
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)
index 50de992c5c1d51fe6ad50c40c152bd63f84869d0..342b4100f12d5a56262a13290c27298431e82325 100644 (file)
--- a/cache.h
+++ b/cache.h
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *);
+extern void update_index_if_able(struct index_state *, struct lock_file *);
extern int hold_locked_index(struct lock_file *, int);
extern int commit_locked_index(struct lock_file *);
diff --git a/read-cache.c b/read-cache.c
index 4f2e890b01b0c27ef2e49080e1fd34bf67e969c7..0480d9455cec042cf128e4d92bbc44a9dcc3fe32 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
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;