Merge branch 'kd/stash-with-bash-4.4' into next

diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index 933915ec06ec725f7cf6a9ed3e251f6ff2390f76..d9d2f545a4ed735e02f7d5cd6ceee7d873fdec94 100755 (executable)
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -273,6 +273,29 @@ test_expect_success SYMLINKS 'conditional include, relative path with symlinks'
        )
 '
 
+test_expect_success SYMLINKS 'conditional include, gitdir matching symlink' '
+       ln -s foo bar &&
+       (
+               cd bar &&
+               echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config &&
+               echo "[test]seven=7" >.git/bar7 &&
+               echo 7 >expect &&
+               git config test.seven >actual &&
+               test_cmp expect actual
+       )
+'
+
+test_expect_success SYMLINKS 'conditional include, gitdir matching symlink, icase' '
+       (
+               cd bar &&
+               echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&
+               echo "[test]eight=8" >.git/bar8 &&
+               echo 8 >expect &&
+               git config test.eight >actual &&
+               test_cmp expect actual
+       )
+'
+
 test_expect_success 'include cycles are detected' '
        cat >.gitconfig <<-\EOF &&
        [test]value = gitconfig