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

Merge branch 'jc/maint-add-sync-stat'

Browse Source 
* jc/maint-add-sync-stat:
  t2200: test more cases of "add -u"
  git-add: make the entry stat-clean after re-adding the same contents
  ce_match_stat, run_diff_files: use symbolic constants for readability

Conflicts:

	builtin-add.c
This commit is contained in:
Junio C Hamano
2007-11-14 14:15:40 -08:00
parent ef4de8357d 25487bde2a
commit c78a24986d
10 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unpack-trees.c
View File

@ -404,7 +404,7 @@ static void verify_uptodate(struct cache_entry *ce,
return;
if (!lstat(ce->name, &st)) {
unsigned changed = ce_match_stat(ce, &st, 1);
unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID);
if (!changed)
return;
/*
@ -925,7 +925,7 @@ int oneway_merge(struct cache_entry **src,
if (o->reset) {
struct stat st;
if (lstat(old->name, &st) ||
ce_match_stat(old, &st, 1))
ce_match_stat(old, &st, CE_MATCH_IGNORE_VALID))
old->ce_flags |= htons(CE_UPDATE);
}
return keep_entry(old, o);