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

2
builtin-apply.c
View File

@ -1993,7 +1993,7 @@ static int verify_index_match(struct cache_entry *ce, struct stat *st)
return -1;
return 0;
}
return ce_match_stat(ce, st, 1);
return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
}
static int check_patch(struct patch *patch, struct patch *prev_patch)