diff options
-rw-r--r-- | diff-no-index.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index b1ae7912c1..f6994cf5fb 100644 --- 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; |