Merge branch 'js/filter-branch-submodule'

diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index f4294d72d92c078bbe4c13a74aed5e3853ad6813..ccb0a3cb61be3bb591033564b221726a4cd3968d 100755 (executable)
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Carlos Rica
 #
 
-test_description='git-stripspace'
+test_description='git stripspace'
 
 . ./test-lib.sh
 
@@ -15,293 +15,306 @@ ttt="$t40$t40$t40$t40$t40$t40$t40$t40$t40$t40" # 400
 test_expect_success \
     'long lines without spaces should be unchanged' '
     echo "$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt$ttt$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual
+    git stripspace <expect >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
     'lines with spaces at the beginning should be unchanged' '
     echo "$sss$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$sss$sss$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$sss$sss$sss$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual
+    git stripspace <expect >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
     'lines with intermediate spaces should be unchanged' '
     echo "$ttt$sss$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual &&
+    git stripspace <expect >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$sss$sss$ttt" >expect &&
-    git-stripspace <expect >actual &&
-    git diff expect actual
+    git stripspace <expect >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
     'consecutive blank lines should be unified' '
     printf "$ttt\n\n$ttt\n" > expect &&
-    printf "$ttt\n\n\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt\n\n$ttt\n" > expect &&
-    printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
-    printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n\n$ttt\n" > expect &&
-    printf "$ttt\n\n\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n\n$ttt$ttt\n" > expect &&
-    printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
-    printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git-stripspace >actual &&
-    git diff expect actual
+    printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n\n$ttt\n" > expect &&
+    printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt$ttt\n\n$ttt\n" > expect &&
+    printf "$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
+    printf "$ttt$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n\n$ttt\n" > expect &&
+    printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n\n$ttt$ttt\n" > expect &&
+    printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
+    printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
-    'consecutive blank lines at the beginning should be removed' '
-    printf "" > expect &&
-    printf "\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    'only consecutive blank lines should be completely removed' '
+    > expect &&
 
-    printf "" > expect &&
-    printf "\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "$sss\n$sss\n$sss\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "$sss$sss\n$sss\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "\n$sss\n$sss$sss\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "$sss$sss$sss$sss\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "\n$sss$sss$sss$sss\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "" > expect &&
-    printf "\n\n$sss$sss$sss$sss\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
+    test_cmp expect actual
+'
 
+test_expect_success \
+    'consecutive blank lines at the beginning should be removed' '
     printf "$ttt\n" > expect &&
-    printf "\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" > expect &&
-    printf "\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt\n" > expect &&
-    printf "\n\n\n$ttt$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt\n" > expect &&
-    printf "\n\n\n$ttt$ttt$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt$ttt\n" > expect &&
-    printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" > expect &&
-    printf "$sss\n$sss\n$sss\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "\n$sss\n$sss$sss\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$sss$sss\n$sss\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$sss$sss$sss\n\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "\n$sss$sss$sss\n\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "\n\n$sss$sss$sss\n$ttt\n" | git-stripspace >actual &&
-    git diff expect actual
+    printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
     'consecutive blank lines at the end should be removed' '
     printf "$ttt\n" > expect &&
-    printf "$ttt\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" > expect &&
-    printf "$ttt\n\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt\n" > expect &&
-    printf "$ttt$ttt\n\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt\n" > expect &&
-    printf "$ttt$ttt$ttt\n\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt$ttt\n" > expect &&
-    printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" > expect &&
-    printf "$ttt\n$sss\n$sss\n$sss\n" | git-stripspace >actual &&
-    git diff expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$ttt\n\n$sss\n$sss$sss\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$ttt\n$sss$sss\n$sss\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$ttt\n$sss$sss$sss\n\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$ttt\n\n$sss$sss$sss\n\n" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$ttt\n" > expect &&
-    printf "$ttt\n\n\n$sss$sss$sss\n" | git-stripspace >actual &&
-    git diff expect actual
+    printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
 test_expect_success \
     'text without newline at end should end with newline' '
-    test `printf "$ttt" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt$ttt" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt$ttt$ttt" | git-stripspace | wc -l` -gt 0
+    test `printf "$ttt" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0
 '
 
 # text plus spaces at the end:
 
 test_expect_success \
     'text plus spaces without newline at end should end with newline' '
-    test `printf "$ttt$sss" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt$sss" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt$ttt$sss" | git-stripspace | wc -l` -gt 0
-    test `printf "$ttt$sss$sss" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$ttt$sss$sss" | git-stripspace | wc -l` -gt 0 &&
-    test `printf "$ttt$sss$sss$sss" | git-stripspace | wc -l` -gt 0
+    test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
+    test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0
 '
 
-test_expect_failure \
+test_expect_success \
     'text plus spaces without newline at end should not show spaces' '
-    printf "$ttt$sss" | git-stripspace | grep -q "  " ||
-    printf "$ttt$ttt$sss" | git-stripspace | grep -q "  " ||
-    printf "$ttt$ttt$ttt$sss" | git-stripspace | grep -q "  " ||
-    printf "$ttt$sss$sss" | git-stripspace | grep -q "  " ||
-    printf "$ttt$ttt$sss$sss" | git-stripspace | grep -q "  " ||
-    printf "$ttt$sss$sss$sss" | git-stripspace | grep -q "  "
+    ! (printf "$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (printf "$ttt$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (printf "$ttt$ttt$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (printf "$ttt$sss$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (printf "$ttt$ttt$sss$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (printf "$ttt$sss$sss$sss" | git stripspace | grep "  " >/dev/null)
 '
 
 test_expect_success \
     'text plus spaces without newline should show the correct lines' '
     printf "$ttt\n" >expect &&
-    printf "$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" >expect &&
-    printf "$ttt$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt\n" >expect &&
-    printf "$ttt$sss$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt\n" >expect &&
-    printf "$ttt$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt\n" >expect &&
-    printf "$ttt$ttt$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     printf "$ttt$ttt$ttt\n" >expect &&
-    printf "$ttt$ttt$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual
+    printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
-test_expect_failure \
+test_expect_success \
     'text plus spaces at end should not show spaces' '
-    echo "$ttt$sss" | git-stripspace | grep -q "  " ||
-    echo "$ttt$ttt$sss" | git-stripspace | grep -q "  " ||
-    echo "$ttt$ttt$ttt$sss" | git-stripspace | grep -q "  " ||
-    echo "$ttt$sss$sss" | git-stripspace | grep -q "  " ||
-    echo "$ttt$ttt$sss$sss" | git-stripspace | grep -q "  " ||
-    echo "$ttt$sss$sss$sss" | git-stripspace | grep -q "  "
+    ! (echo "$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (echo "$ttt$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (echo "$ttt$ttt$ttt$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (echo "$ttt$sss$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (echo "$ttt$ttt$sss$sss" | git stripspace | grep "  " >/dev/null) &&
+    ! (echo "$ttt$sss$sss$sss" | git stripspace | grep "  " >/dev/null)
 '
 
 test_expect_success \
     'text plus spaces at end should be cleaned and newline must remain' '
     echo "$ttt" >expect &&
-    echo "$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt" >expect &&
-    echo "$ttt$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$ttt$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt" >expect &&
-    echo "$ttt$sss$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$ttt$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt" >expect &&
-    echo "$ttt$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$ttt$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt" >expect &&
-    echo "$ttt$ttt$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
     echo "$ttt$ttt$ttt" >expect &&
-    echo "$ttt$ttt$ttt$sss" | git-stripspace >actual &&
-    git diff expect actual
+    echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
 # spaces only:
@@ -310,46 +323,78 @@ test_expect_success \
     'spaces with newline at end should be replaced with empty string' '
     printf "" >expect &&
 
-    echo | git-stripspace >actual &&
-    git diff expect actual &&
+    echo | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    echo "$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    echo "$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    echo "$sss$sss$sss" | git-stripspace >actual &&
-    git diff expect actual &&
+    echo "$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    echo "$sss$sss$sss$sss" | git-stripspace >actual &&
-    git diff expect actual
+    echo "$sss$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual
 '
 
-test_expect_failure \
+test_expect_success \
     'spaces without newline at end should not show spaces' '
-    printf "" | git-stripspace | grep -q " " ||
-    printf "$sss" | git-stripspace | grep -q " " ||
-    printf "$sss$sss" | git-stripspace | grep -q " " ||
-    printf "$sss$sss$sss" | git-stripspace | grep -q " " ||
-    printf "$sss$sss$sss$sss" | git-stripspace | grep -q " "
+    ! (printf "" | git stripspace | grep " " >/dev/null) &&
+    ! (printf "$sss" | git stripspace | grep " " >/dev/null) &&
+    ! (printf "$sss$sss" | git stripspace | grep " " >/dev/null) &&
+    ! (printf "$sss$sss$sss" | git stripspace | grep " " >/dev/null) &&
+    ! (printf "$sss$sss$sss$sss" | git stripspace | grep " " >/dev/null)
 '
 
 test_expect_success \
     'spaces without newline at end should be replaced with empty string' '
     printf "" >expect &&
 
-    printf "" | git-stripspace >actual &&
-    git diff expect actual
+    printf "" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$sss$sss" | git-stripspace >actual &&
-    git diff expect actual
+    printf "$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual &&
 
-    printf "$sss$sss$sss" | git-stripspace >actual &&
-    git diff expect actual
+    printf "$sss$sss$sss$sss" | git stripspace >actual &&
+    test_cmp expect actual
+'
+
+test_expect_success \
+    'consecutive text lines should be unchanged' '
+    printf "$ttt$ttt\n$ttt\n" >expect &&
+    printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
+    printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
+    printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
+    printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
+    printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual &&
+
+    printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
+    printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >actual &&
+    test_cmp expect actual
+'
 
-    printf "$sss$sss$sss$sss" | git-stripspace >actual &&
-    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