summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 14:15:40 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 14:15:40 -0800
commitc78a24986d4d3faff810e87dbcd0ac99f0eabbce (patch)
tree29ceb2cf66c2454949d42dae7d8a70cb8f87d70e /entry.c
parentef4de8357dff57d403073572e8b260618bd03175 (diff)
parent25487bde2ab756a423489fc942b37c1550555b93 (diff)
downloadgit-c78a24986d4d3faff810e87dbcd0ac99f0eabbce.tar.gz
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 'entry.c')
-rw-r--r--entry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/entry.c b/entry.c
index cfadc6a292..257ab46e94 100644
--- a/entry.c
+++ b/entry.c
@@ -203,7 +203,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
strcpy(path + len, ce->name);
if (!lstat(path, &st)) {
- unsigned changed = ce_match_stat(ce, &st, 1);
+ unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID);
if (!changed)
return 0;
if (!state->force) {