Merge branch 'pe/cleanup' into next

diff --git a/diff.c b/diff.c
index 8b37477afc3bf8555f0b6c9f0d6f116a39784817..e496905bad9853f912e1bbcc081c544524f8cb77 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -300,7 +300,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
                   unsigned short mode)
 {
        if (mode) {
-               spec->mode = DIFF_FILE_CANON_MODE(mode);
+               spec->mode = canon_mode(mode);
                memcpy(spec->sha1, sha1, 20);
                spec->sha1_valid = !!memcmp(sha1, null_sha1, 20);
        }