undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Rast 2009-01-07 00:56:03 +01:00 committed by Junio C Hamano
parent e423ffd8a6
commit c6dbca08ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
diff-no-index.c
View File

@ -200,13 +200,6 @@ void diff_no_index(struct rev_info *revs,
die("git diff %s takes two paths", die("git diff %s takes two paths",
no_index ? "--no-index" : "[--no-index]"); 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); diff_setup(&revs->diffopt);
if (!revs->diffopt.output_format) if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH; 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) { if (prefix) {
int len = strlen(prefix); int len = strlen(prefix);