summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--diff-no-index.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index fc1decdf38..77667b810d 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -224,8 +224,6 @@ void diff_no_index(struct rev_info *revs,
}
}
- setup_diff_pager(&revs->diffopt);
-
if (prefix) {
int len = strlen(prefix);
const char *paths[3];
@@ -250,13 +248,15 @@ void diff_no_index(struct rev_info *revs,
if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
- DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
revs->max_count = -2;
if (diff_setup_done(&revs->diffopt) < 0)
die("diff_setup_done failed");
+ setup_diff_pager(&revs->diffopt);
+ DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
+
if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
revs->diffopt.pathspec.raw[1]))
exit(1);