undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/nostat'

Browse Source 
* jc/nostat:
  "Assume unchanged" git: --really-refresh fix.
This commit is contained in:
Junio C Hamano 2006-02-09 00:55:45 -08:00
commit 0509ef3d21
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
update-index.c
View File

@ -161,8 +161,13 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce, int really)
return ERR_PTR(-errno); return ERR_PTR(-errno);
changed = ce_match_stat(ce, &st, really); changed = ce_match_stat(ce, &st, really);
if (!changed) if (!changed) {
if (really && assume_unchanged &&
!(ce->ce_flags & htons(CE_VALID)))
; /* mark this one VALID again */
else
return NULL; return NULL;
}
if (ce_modified(ce, &st, really)) if (ce_modified(ce, &st, really))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);