[PATCH 06/12] apply: run setup_git_directory_gently() sooner
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 6, 2010, 03:08 UTC
- Message-ID
- <20100806030844.GJ22369@burratino>
- In-Reply-To
- <20100806023529.GB22369@burratino>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
As v1.7.2~16^2 (2010-07-14) explains, without this change, “git --paginate apply” can ignore the repository-local “[core] pager” configuration.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- New explanation and test; simplified patch by keeping the is_not_gitdir local.
builtin/apply.c | 3 +-- git.c | 2 +- t/t7006-pager.sh | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c index 562e534..08f3586 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3611,7 +3611,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) { int i; int errs = 0; - int is_not_gitdir; + int is_not_gitdir = !startup_info->have_repository; int binary; int force_apply = 0; @@ -3684,7 +3684,6 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) OPT_END() }; - prefix = setup_git_directory_gently(&is_not_gitdir); prefix_length = prefix ? strlen(prefix) : 0; git_config(git_apply_config, NULL); if (apply_default_whitespace) diff --git a/git.c b/git.c index 0240179..82b390b 100644 --- a/git.c +++ b/git.c @@ -301,7 +301,7 @@ static void handle_internal_command(int argc, const char **argv) { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE }, { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE }, { "annotate", cmd_annotate, RUN_SETUP }, - { "apply", cmd_apply }, + { "apply", cmd_apply, RUN_SETUP_GENTLY }, { "archive", cmd_archive }, { "bisect--helper", cmd_bisect__helper, RUN_SETUP | NEED_WORK_TREE }, { "blame", cmd_blame, RUN_SETUP }, diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index fd7f77b..96fbb0f 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -399,4 +399,7 @@ test_no_local_config_subdir expect_success 'git shortlog' test_default_pager expect_success 'git -p shortlog' test_core_pager_subdir expect_success 'git -p shortlog' +test_core_pager_subdir expect_success test_must_fail \ + 'git -p apply </dev/null' + test_done
-- 1.7.2.1.544.ga752d.dirty