diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-21 10:16:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-21 12:43:10 -0700 |
| commit | ccdc4ec3044bd108ae1e20d772f078c10df114b3 (patch) | |
| tree | 54b78634ed72b83854ff5d9564a76ec6020e7d73 /read-cache.c | |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a (diff) | |
| download | git-ccdc4ec3044bd108ae1e20d772f078c10df114b3.tar.gz | |
diff/status: refactor opportunistic index update
When we had to refresh the index internally before running diff or status,
we opportunistically updated the $GIT_INDEX_FILE so that later invocation
of git can use the lstat(2) we already did in this invocation.
Make them share a helper function to do so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 1f42473e80..7a0421cba4 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1545,6 +1545,18 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce) return result; } +/* + * 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 && + !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; |