RelNotes draft for 1.5.3 update.

diff --git a/diff.c b/diff.c
index f884de77ac2a0175e317628e25ec9ee3aaa902f7..a7e76719d12a9083c465d60eee333aa880b5a1c2 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2919,10 +2919,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
                                fill_mmfile(&mf2, p->two) < 0)
                        return error("unable to read files to diff");
 
-               /* Maybe hash p->two? into the patch id? */
-               if (diff_filespec_is_binary(p->two))
-                       continue;
-
                len1 = remove_space(p->one->path, strlen(p->one->path));
                len2 = remove_space(p->two->path, strlen(p->two->path));
                if (p->one->mode == 0)
@@ -3185,7 +3181,8 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
                         * to determine how many paths were dirty only
                         * due to stat info mismatch.
                         */
-                       diffopt->skip_stat_unmatch++;
+                       if (!diffopt->no_index)
+                               diffopt->skip_stat_unmatch++;
                        diff_free_filepair(p);
                }
        }