diff --git a/diff-files.c b/diff-files.c
index 574294f30254c3082820aa678b6df353540fefbf..3e7f5f105b19fd47fd8b3716617592ec2a60da47 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
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 */
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))