Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'

diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index 5e3fb3a6afec21d17c9ebe2567b42019f87bc7b1..f1f9aee9f5dcbcd2e722298736f990dfcf114f23 100755 (executable)
--- 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