Browse Source

git diff --no-index: default to page like other diff frontends

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 17 years ago
parent
commit
b3fde6ccb1
  1. 7
      diff-no-index.c

7
diff-no-index.c

@ -198,6 +198,13 @@ void diff_no_index(struct rev_info *revs, @@ -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;

Loading…
Cancel
Save