This is the third version of my attempt to make `pager tag` useful (v1 at [1], v2 at [2]). Thanks to Junio and Peff for comments on v2. I've squashed patches 01-03/10 and 07-08/10, respectively. The interdiff is below. I managed to clean up some tests thanks to a drive-by comment by Peff which cleared up a misunderstanding I had. Some minor changes, e.g., I write "built-in" instead of "builtin", since that seemed preferred, at least locally in builtin.h. I documented why a default value of "punt" could be useful, but also that it's probably not wanted. Martin [1] https://public-inbox.org/git/cover.1499723297.git.martin.agren@xxxxxxxxx/T/ [2] https://public-inbox.org/git/cover.1500321657.git.martin.agren@xxxxxxxxx/T/#u Martin Ågren (7): builtin.h: take over documentation from api-builtin.txt git.c: let builtins opt for handling `pager.foo` themselves git.c: provide setup_auto_pager() t7006: add tests for how git tag paginates tag: respect `pager.tag` in list-mode only tag: change default of `pager.tag` to "on" git.c: ignore pager.* when launching builtin as dashed external Documentation/git-tag.txt | 3 + Documentation/technical/api-builtin.txt | 73 ----------------------- t/t7006-pager.sh | 80 +++++++++++++++++++++++++ builtin.h | 100 ++++++++++++++++++++++++++++++++ builtin/tag.c | 3 + git.c | 18 +++++- 6 files changed, 201 insertions(+), 76 deletions(-) delete mode 100644 Documentation/technical/api-builtin.txt Interdiff vs v2: diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 8b2ffb1aa..9128ec5ac 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -162,7 +162,7 @@ test_expect_success TTY 'git tag with no args defaults to paging' ' test_expect_success TTY 'git tag with no args respects pager.tag' ' # no args implies -l so this should page like -l rm -f paginated.out && - test_terminal git -c pager.tag=no tag && + test_terminal git -c pager.tag=false tag && ! test -e paginated.out ' @@ -202,20 +202,15 @@ test_expect_success TTY 'git tag -a respects --paginate' ' ' test_expect_success TTY 'git tag as alias ignores pager.tag with -a' ' - # git-tag will be launched as a dashed external, which - # 1) is the source of a potential bug, and - # 2) is why we use test_config and not -c. test_when_finished "git tag -d newtag" && rm -f paginated.out && - test_config pager.tag true && - test_terminal git -c alias.t=tag t -am message newtag && + test_terminal git -c pager.tag -c alias.t=tag t -am message newtag && ! test -e paginated.out ' test_expect_success TTY 'git tag as alias respects pager.tag with -l' ' rm -f paginated.out && - test_config pager.tag false && - test_terminal git -c alias.t=tag t -l && + test_terminal git -c pager.tag=false -c alias.t=tag t -l && ! test -e paginated.out ' diff --git a/builtin.h b/builtin.h index 3ca4a53a8..42378f3aa 100644 --- a/builtin.h +++ b/builtin.h @@ -51,15 +51,15 @@ * on bare repositories. * This only makes sense when `RUN_SETUP` is also set. * - * `SUPPORT_SUPER_PREFIX`:: + * `SUPPORT_SUPER_PREFIX`: * - * The builtin supports `--super-prefix`. + * The built-in supports `--super-prefix`. * - * `DELAY_PAGER_CONFIG`:: + * `DELAY_PAGER_CONFIG`: * * If RUN_SETUP or RUN_SETUP_GENTLY is set, git.c normally handles * the `pager.<cmd>`-configuration. If this flag is used, git.c - * will skip that step, instead allowing the builtin to make a + * will skip that step, instead allowing the built-in to make a * more informed decision, e.g., by ignoring `pager.<cmd>` for * certain subcommands. * @@ -114,11 +114,14 @@ extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *); /** - * If a builtin has DELAY_PAGER_CONFIG set, the builtin should call this early + * If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early * when it wishes to respect the `pager.foo`-config. The `cmd` is the name of - * the builtin, e.g., "foo". If a paging-choice has already been setup, this + * the built-in, e.g., "foo". If a paging-choice has already been setup, this * does nothing. The default in `def` should be 0 for "pager off", 1 for "pager * on" or -1 for "punt". + * + * You should most likely use a default of 0 or 1. "Punt" (-1) could be useful + * to be able to fall back to some historical compatibility name. */ extern void setup_auto_pager(const char *cmd, int def); -- 2.14.0.rc1.12.ge2d9c4613
