diff --no-index: test for pager after option parsing

We need to parse options before we can see if --exit-code was
provided.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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


@@ -226,6 +219,13 @@ void diff_no_index(struct rev_info *revs,
                }
        }
 
                }
        }
 

+       /*
+        * 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();
+

        if (prefix) {
                int len = strlen(prefix);
 
        if (prefix) {
                int len = strlen(prefix);