summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/diff-files.c b/diff-files.c
index f3a79e5c03..3b05497a85 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,