Merge branch 'jc/color'

diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index b1c900379b22076ad69fa5d585fc9cbc0dc27c21..cad95f35adad5864e99ef5cd1633c820ff25b6c0 100755 (executable)
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -392,4 +392,9 @@ test_expect_success \
     git diff expect actual
 '
 
+test_expect_success 'strip comments, too' '
+       test ! -z "$(echo "# comment" | git stripspace)" &&
+       test -z "$(echo "# comment" | git stripspace -s)"
+'
+
 test_done