X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-files.c;h=3b05497a8573427f28a00e86fa4f2bf7bf920e74;hb=a325a11b88bc13d569be1571ce559858dc224af4;hp=f3a79e5c03676f340424913a354d35a9c5c61554;hpb=af5323e0274fad058f13949b89a9191a7bef7e38;p=git.git

diff --git a/diff-files.c b/diff-files.c
index f3a79e5c..3b05497a 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -88,7 +88,7 @@ int main(int argc, const char **argv)
 
 	for (i = 0; i < entries; i++) {
 		struct stat st;
-		unsigned int oldmode, mode;
+		unsigned int oldmode;
 		struct cache_entry *ce = active_cache[i];
 		int changed;
 
@@ -116,10 +116,8 @@ int main(int argc, const char **argv)
 			continue;
 
 		oldmode = ntohl(ce->ce_mode);
-		mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
-			S_IFREG | ce_permissions(st.st_mode));
-
-		show_modified(oldmode, mode, ce->sha1, null_sha1,
+		show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
+			      ce->sha1, null_sha1,
 			      ce->name);
 	}
 	diffcore_std((1 < argc) ? argv + 1 : NULL,