branch --merged/--no-merged: allow specifying arbitrary commit

[git.git] / diff-no-index.c

diff --git a/diff-no-index.c b/diff-no-index.c
index b1ae7912c18ee762d22b5530fba8ad39f2364315..f6994cf5fb0b9fa570ded7012088ba8b8be5fd71 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -198,6 +198,13 @@ void diff_no_index(struct rev_info *revs,
                die("git diff %s takes two paths",
                    no_index ? "--no-index" : "[--no-index]");
 
+       /*
+        * 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 (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
+               setup_pager();
+
        diff_setup(&revs->diffopt);
        if (!revs->diffopt.output_format)
                revs->diffopt.output_format = DIFF_FORMAT_PATCH;