mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-25 07:30:56 +02:00
Code

Merge branch 'jk/pager-per-command'

Browse Source 
* jk/pager-per-command:
  allow command-specific pagers in pager.<cmd>
This commit is contained in:
Junio C Hamano 2010-12-08 11:24:14 -08:00
commit 23778ae9a0
3 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/config.txt
View File

@ -1545,11 +1545,13 @@ pack.packSizeLimit::
supported.
pager.<cmd>::
Allows turning on or off pagination of the output of a
particular git subcommand when writing to a tty. If
`\--paginate` or `\--no-pager` is specified on the command line,
it takes precedence over this option. To disable pagination for
all commands, set `core.pager` or `GIT_PAGER` to `cat`.
If the value is boolean, turns on or off pagination of the
output of a particular git subcommand when writing to a tty.
Otherwise, turns on pagination for the subcommand using the
pager specified by the value of `pager.<cmd>`. If `\--paginate`
or `\--no-pager` is specified on the command line, it takes
precedence over this option. To disable pagination for all
commands, set `core.pager` or `GIT_PAGER` to `cat`.
pretty.<name>::
Alias for a --pretty= format string, as specified in

21
git.c
View File

@ -19,14 +19,22 @@ static struct startup_info git_startup_info;
static int use_pager = -1;
struct pager_config {
const char *cmd;
int val;
int want;
char *value;
};
static int pager_command_config(const char *var, const char *value, void *data)
{
struct pager_config *c = data;
if (!prefixcmp(var, "pager.") && !strcmp(var + 6, c->cmd))
c->val = git_config_bool(var, value);
if (!prefixcmp(var, "pager.") && !strcmp(var + 6, c->cmd)) {
int b = git_config_maybe_bool(var, value);
if (b >= 0)
c->want = b;
else {
c->want = 1;
c->value = xstrdup(value);
}
}
return 0;
}
@ -35,9 +43,12 @@ int check_pager_config(const char *cmd)
{
struct pager_config c;
c.cmd = cmd;
c.val = -1;
c.want = -1;
c.value = NULL;
git_config(pager_command_config, &c);
return c.val;
if (c.value)
pager_program = c.value;
return c.want;
}
static void commit_pager_choice(void) {

29
t/t7006-pager.sh
View File

@ -401,4 +401,33 @@ test_core_pager_subdir expect_success 'git -p shortlog'
test_core_pager_subdir expect_success test_must_fail \
'git -p apply </dev/null'
test_expect_success TTY 'command-specific pager' '
unset PAGER GIT_PAGER;
echo "foo:initial" >expect &&
>actual &&
git config --unset core.pager &&
git config pager.log "sed s/^/foo:/ >actual" &&
test_terminal git log --format=%s -1 &&
test_cmp expect actual
'
test_expect_success TTY 'command-specific pager overrides core.pager' '
unset PAGER GIT_PAGER;
echo "foo:initial" >expect &&
>actual &&
git config core.pager "exit 1"
git config pager.log "sed s/^/foo:/ >actual" &&
test_terminal git log --format=%s -1 &&
test_cmp expect actual
'
test_expect_success TTY 'command-specific pager overridden by environment' '
GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
>actual &&
echo "foo:initial" >expect &&
git config pager.log "exit 1" &&
test_terminal git log --format=%s -1 &&
test_cmp expect actual
'
test_done