diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:15:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:15:40 -0800 |
| commit | c78a24986d4d3faff810e87dbcd0ac99f0eabbce (patch) | |
| tree | 29ceb2cf66c2454949d42dae7d8a70cb8f87d70e /builtin-apply.c | |
| parent | ef4de8357dff57d403073572e8b260618bd03175 (diff) | |
| parent | 25487bde2ab756a423489fc942b37c1550555b93 (diff) | |
| download | git-c78a24986d4d3faff810e87dbcd0ac99f0eabbce.tar.gz git-c78a24986d4d3faff810e87dbcd0ac99f0eabbce.tar.xz | |
Merge branch 'jc/maint-add-sync-stat'
* 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
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 8411b38c7..8edcc08b6 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -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) |