diff: don't run pager if user asked for a diff style exit code

diff --git a/builtin-diff.c b/builtin-diff.c
index 4ba4d18f871122e0585ead1d09deb728ff518174..8dc17b0dd7af33f83aebeae88d4e616e76da52eb 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -32,7 +32,7 @@ static void stuff_change(struct diff_options *opt,
        struct diff_filespec *one, *two;
 
        if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
-           !hashcmp(old_sha1, new_sha1))
+           !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
                return;
 
        if (opt->reverse_diff) {
@@ -233,6 +233,13 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                        die("diff_setup_done failed");
        }
        rev.diffopt.allow_external = 1;
+       rev.diffopt.recursive = 1;
+
+       /* If the user asked for our exit code then don't start a
+        * pager or we would end up reporting its exit code instead.
+        */
+       if (!rev.diffopt.exit_with_status)
+               setup_pager();
 
        /* Do we have --cached and not have a pending object, then
         * default to HEAD by hand.  Eek.