Skip to content

Commit 1af3d97

Browse files
peffgitster
authored andcommitted
fix pager.diff with diff --no-index
git-diff does not rely on the git wrapper to setup its pager; instead, it sets it up on its own after seeing whether --quiet or --exit-code has been specified. After diff_no_index was split off from cmd_diff, commit b3fde6c (git diff --no-index: default to page like other diff frontends, 2008-05-26) duplicated the one-liner from cmd_diff to turn on the pager. Later, commit 8f0359f (Allow pager of diff command be enabled/disabled, 2008-07-21) taught the the version in cmd_diff to respect the pager.diff config, but the version in diff_no_index was left behind. This meant that git -c pager.diff=0 diff a b would not use a pager, but git -c pager.diff=0 diff --no-index a b would. Let's fix it by factoring out a common function. While we're there, let's update the antiquated comment, which claims that the pager interferes with propagating the exit code; this has not been the case since ea27a18 (spawn pager via run_command interface, 2008-07-22). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 121f71f commit 1af3d97

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

builtin.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
4141
void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
4242

4343
extern int check_pager_config(const char *cmd);
44+
struct diff_options;
45+
extern void setup_diff_pager(struct diff_options *);
4446

4547
extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size);
4648

builtin/diff.c

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
304304

305305
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
306306

307-
/*
308-
* If the user asked for our exit code then don't start a
309-
* pager or we would end up reporting its exit code instead.
310-
*/
311-
if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
312-
check_pager_config("diff") != 0)
313-
setup_pager();
307+
setup_diff_pager(&rev.diffopt);
314308

315309
/*
316310
* Do we have --cached and not have a pending object, then
@@ -421,3 +415,19 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
421415
refresh_index_quietly();
422416
return result;
423417
}
418+
419+
void setup_diff_pager(struct diff_options *opt)
420+
{
421+
/*
422+
* If the user asked for our exit code, then either they want --quiet
423+
* or --exit-code. We should definitely not bother with a pager in the
424+
* former case, as we will generate no output. Since we still properly
425+
* report our exit code even when a pager is run, we _could_ run a
426+
* pager with --exit-code. But since we have not done so historically,
427+
* and because it is easy to find people oneline advising "git diff
428+
* --exit-code" in hooks and other scripts, we do not do so.
429+
*/
430+
if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
431+
check_pager_config("diff") != 0)
432+
setup_pager();
433+
}

diff-no-index.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,7 @@ void diff_no_index(struct rev_info *revs,
224224
}
225225
}
226226

227-
/*
228-
* If the user asked for our exit code then don't start a
229-
* pager or we would end up reporting its exit code instead.
230-
*/
231-
if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
232-
setup_pager();
227+
setup_diff_pager(&revs->diffopt);
233228

234229
if (prefix) {
235230
int len = strlen(prefix);

0 commit comments

Comments
 (0)