Merge branch 'py/diff-submodule'

[git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 4a3e25536c894dfb928754e6314a400d39c6f9ad..c5894c7c5aa166370f407ace804dc1a857d04fe4 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -498,8 +498,11 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                        continue;
                }
                changed = ce_match_stat(ce, &st, ce_option);
-               if (!changed && !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
-                       continue;
+               if (!changed) {
+                       ce_mark_uptodate(ce);
+                       if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
+                               continue;
+               }
                oldmode = ce->ce_mode;
                newmode = ce_mode_from_stat(ce, st.st_mode);
                diff_change(&revs->diffopt, oldmode, newmode,