summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-27 03:13:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-27 03:13:16 (GMT)
commit149971badc562f4e5ee66c045f40c904fb29eab6 (patch)
tree020dbffb91e75d4a001bffe52c804018ca2f1e66
parent4d46ee74e11416e7edf6624611242fe2f98f078c (diff)
parent483fbe2b7cb89ddcf700a677735d21aa176bc5a6 (diff)
downloadgit-149971badc562f4e5ee66c045f40c904fb29eab6.zip
git-149971badc562f4e5ee66c045f40c904fb29eab6.tar.gz
git-149971badc562f4e5ee66c045f40c904fb29eab6.tar.bz2
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
-rw-r--r--builtin/commit.c9
-rw-r--r--builtin/diff.c7
-rw-r--r--cache.h1
-rw-r--r--read-cache.c25
4 files changed, 29 insertions, 13 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 3979b82..54b2049 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 4c9deb2..655a013 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)
diff --git a/cache.h b/cache.h
index abef5b6..9f06d21 100644
--- a/cache.h
+++ b/cache.h
@@ -543,6 +543,7 @@ extern NORETURN void unable_to_lock_index_die(const char *path, int err);
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 98d526b..f38471c 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1547,6 +1547,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;