зеркало из https://github.com/microsoft/git.git
git diff --no-index: default to page like other diff frontends
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
040366076f
Коммит
b3fde6ccb1
|
@ -198,6 +198,13 @@ 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;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче