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 /unpack-trees.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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index c527d7d04..aea16adde 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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); |