summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 12:09:14 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-15 12:09:14 -0700
commit53b304224a561b5fd4ae35cedc0a978d91d4b1da (patch)
tree0d83b638b05e36452d1a49623a57908dbdf3bb78 /git.c
parentea56a7ed971f3bd547abb16a3cb9a41c00133c85 (diff)
parent030149a4dcd584f6b47221f5b087d081e582d790 (diff)
downloadgit-53b304224a561b5fd4ae35cedc0a978d91d4b1da.tar.gz
Merge branch 'jn/paginate-fix'
* jn/paginate-fix: git --paginate: paginate external commands again git --paginate: do not commit pager choice too early tests: local config file should be honored from subdirs of toplevel t7006: test pager configuration for several git commands t7006 (pager): introduce helper for parameterized tests Conflicts: t/t7006-pager.sh
Diffstat (limited to 'git.c')
-rw-r--r--git.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/git.c b/git.c
index 265fa09d8d..17538117a5 100644
--- a/git.c
+++ b/git.c
@@ -167,6 +167,7 @@ static int handle_alias(int *argcp, const char ***argv)
alias_string = alias_lookup(alias_command);
if (alias_string) {
if (alias_string[0] == '!') {
+ commit_pager_choice();
if (*argcp > 1) {
struct strbuf buf;
@@ -432,6 +433,8 @@ static void execv_dashed_external(const char **argv)
const char *tmp;
int status;
+ commit_pager_choice();
+
strbuf_addf(&cmd, "git-%s", argv[0]);
/*
@@ -511,12 +514,12 @@ int main(int argc, const char **argv)
argv++;
argc--;
handle_options(&argv, &argc, NULL);
- commit_pager_choice();
if (argc > 0) {
if (!prefixcmp(argv[0], "--"))
argv[0] += 2;
} else {
/* The user didn't specify a command; give them help */
+ commit_pager_choice();
printf("usage: %s\n\n", git_usage_string);
list_common_cmds_help();
printf("\n%s\n", git_more_info_string);