t4012: modernize style for quoting

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

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 6cebb3951bc7f4e9b772efed052c485d82d1a68d..2a8b68ef4898beb7ee5929545146c069c12c472e 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -15,13 +15,14 @@ cat >expect.binary-numstat <<\EOF
 -      -       d
 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 &&
         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 +-
 
 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.
 
 # 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
         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` &&
         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
         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` &&
         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 '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 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` &&
         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 &&
 
 test_expect_success 'diff --no-index with binary creation' '
        echo Q | q_to_nul >binary &&