X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=3e7f5f105b19fd47fd8b3716617592ec2a60da47;hb=170abc81a0f7bc02702189bacf7eeab74223d922;hp=7db5ce6407b9755e42445a7cf43d6dc5615bf3e7;hpb=0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 7db5ce64..3e7f5f10 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -149,7 +149,9 @@ int main(int argc, const char **argv)
 					memcpy(combine.p.parent[stage-2].sha1,
 					       nce->sha1, 20);
 					combine.p.parent[stage-2].mode =
-						DIFF_FILE_CANON_MODE(mode);
+						canon_mode(mode);
+					combine.p.parent[stage-2].status =
+						DIFF_STATUS_MODIFIED;
 				}
 
 				/* diff against the proper unmerged stage */
@@ -191,12 +193,12 @@ int main(int argc, const char **argv)
 			show_file('-', ce);
 			continue;
 		}
-		changed = ce_match_stat(ce, &st);
+		changed = ce_match_stat(ce, &st, 0);
 		if (!changed && !diff_options.find_copies_harder)
 			continue;
 		oldmode = ntohl(ce->ce_mode);
 
-		newmode = DIFF_FILE_CANON_MODE(st.st_mode);
+		newmode = canon_mode(st.st_mode);
 		if (!trust_executable_bit &&
 		    S_ISREG(newmode) && S_ISREG(oldmode) &&
 		    ((newmode ^ oldmode) == 0111))