[PATCH 1/2] Test suite fixup.

diff --git a/diff-files.c b/diff-files.c
index c51edc3315100d8ec75eec72ec2f8a7e3753ad98..28f1b13b384dc122daf2b16574536e944b0f6291 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -126,7 +126,8 @@ int main(int argc, char **argv)
                        continue;
 
                oldmode = ntohl(ce->ce_mode);
-               mode = S_IFREG | ce_permissions(st.st_mode);
+               mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
+                       S_IFREG | ce_permissions(st.st_mode));
 
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);