This quoting style is used by all newly added test code.

Signed-off-by: Alexander Strasser <eclip...@gmx.net>
---
 t/t4012-diff-binary.sh | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 6cebb39..2a8b68e 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -15,13 +15,14 @@ cat >expect.binary-numstat <<\EOF
 -      -       d
 EOF
 
-test_expect_success 'prepare repository' \
-       'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
+test_expect_success 'prepare repository' '
+        echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
         git update-index --add a b c d &&
         echo git >a &&
         cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
         echo git >c &&
-        cat b b >d'
+        cat b b >d
+'
 
 cat > expected <<\EOF
  a |    2 +-
@@ -62,8 +63,8 @@ test_expect_success 'apply --numstat understands diff 
--binary format' '
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
-test_expect_success 'apply detecting corrupt patch correctly' \
-       'git diff | sed -e 's/-CIT/xCIT/' >broken &&
+test_expect_success 'apply detecting corrupt patch correctly' '
+        git diff | sed -e 's/-CIT/xCIT/' >broken &&
         if git apply --stat --summary broken 2>detected
         then
                echo unhappy - should have detected an error
@@ -74,10 +75,11 @@ test_expect_success 'apply detecting corrupt patch 
correctly' \
         detected=`cat detected` &&
         detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
         detected=`sed -ne "${detected}p" broken` &&
-        test "$detected" = xCIT'
+        test "$detected" = xCIT
+'
 
-test_expect_success 'apply detecting corrupt patch correctly' \
-       'git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
+test_expect_success 'apply detecting corrupt patch correctly' '
+        git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
         if git apply --stat --summary broken 2>detected
         then
                echo unhappy - should have detected an error
@@ -88,23 +90,26 @@ test_expect_success 'apply detecting corrupt patch 
correctly' \
         detected=`cat detected` &&
         detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
         detected=`sed -ne "${detected}p" broken` &&
-        test "$detected" = xCIT'
+        test "$detected" = xCIT
+'
 
 test_expect_success 'initial commit' 'git commit -a -m initial'
 
 # Try removal (b), modification (d), and creation (e).
-test_expect_success 'diff-index with --binary' \
-       'echo AIT >a && mv b e && echo CIT >c && cat e >d &&
+test_expect_success 'diff-index with --binary' '
+        echo AIT >a && mv b e && echo CIT >c && cat e >d &&
         git update-index --add --remove a b c d e &&
         tree0=`git write-tree` &&
         git diff --cached --binary >current &&
-        git apply --stat --summary current'
+        git apply --stat --summary current
+'
 
-test_expect_success 'apply binary patch' \
-       'git reset --hard &&
+test_expect_success 'apply binary patch' '
+        git reset --hard &&
         git apply --binary --index <current &&
         tree1=`git write-tree` &&
-        test "$tree1" = "$tree0"'
+        test "$tree1" = "$tree0"
+'
 
 test_expect_success 'diff --no-index with binary creation' '
        echo Q | q_to_nul >binary &&
-- 
1.7.10.2.552.gaa3bb87
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to