summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-08-16 10:36:12 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-15 19:56:10 -0700
commitd1ea896290629185dc0bf4efa3469b410bd41313 (patch)
treeec3be47a2afe45ac6c845c22d71fd63c2b13fd91 /t
parentgrep: run setup_git_directory_gently() sooner (diff)
downloadtgif-d1ea896290629185dc0bf4efa3469b410bd41313.tar.xz
apply: run setup_git_directory_gently() sooner
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7006-pager.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index bb9533581e..6c86d7035f 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -391,4 +391,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