Merge branch 'sb/submodule-embed-gitdir'

diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index 29e91d861cbd6473d80c7343a0e292b010d83173..bbf3e39e3d229fbda5b7e40e9caca3aba2e1f52b 100755 (executable)
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -432,6 +432,15 @@ test_expect_success '-c with changed comment char' '
        test_cmp expect actual
 '
 
+test_expect_success '-c with comment char defined in .git/config' '
+       test_config core.commentchar = &&
+       printf "= foo\n" >expect &&
+       printf "foo" | (
+               mkdir sub && cd sub && git stripspace -c
+       ) >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'avoid SP-HT sequence in commented line' '
        printf "#\tone\n#\n# two\n" >expect &&
        printf "\tone\n\ntwo\n" | git stripspace -c >actual &&