Merge branch 'mh/rebase-skip-hard'

diff --git a/unpack-trees.c b/unpack-trees.c
index c527d7d049155d1808e0bf69aba42d49cea7b68f..aea16adde846b404900555f5f0dd6d87daea8bbf 100644 (file)
--- 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);