summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-19 15:34:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-19 15:34:16 -0700
commitd05d0e99665ecb67c3e8b9b3be40b12e9052a8b8 (patch)
treec4ed27f64e3b43de4b0ae9c63b43ea6e201e7c9f /t
parentMerge branch 'jk/difftool-command-not-found' (diff)
parentrev-parse: respect core.hooksPath in --git-path (diff)
downloadtgif-d05d0e99665ecb67c3e8b9b3be40b12e9052a8b8.tar.xz
Merge branch 'ab/hooks'
"git rev-parse --git-path hooks/<hook>" learned to take core.hooksPath configuration variable (introduced during 2.9 cycle) into account. * ab/hooks: rev-parse: respect core.hooksPath in --git-path
Diffstat (limited to 't')
-rwxr-xr-xt/t1350-config-hooks-path.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index 5e3fb3a6af..f1f9aee9f5 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work'
test_cmp expect actual
'
+test_expect_success 'git rev-parse --git-path hooks' '
+ git config core.hooksPath .git/custom-hooks &&
+ git rev-parse --git-path hooks/abc >actual &&
+ test .git/custom-hooks/abc = "$(cat actual)"
+'
+
test_done