mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/index-update-if-able' into maint

Browse Source 
* jc/index-update-if-able:
  update $GIT_INDEX_FILE when there are racily clean entries
  diff/status: refactor opportunistic index update
This commit is contained in:
Junio C Hamano
2011-04-03 12:33:05 -07:00
parent be57695d77 483fbe2b7c
commit 44ec754dc7
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
read-cache.c
View File

@ -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;