t0040-test-parse-options.sh: fix style issues

Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 9be6411104999959ff93276ec2bbfb065bfa71e7..477fcffa53fc7ba90b6b49956445fa65b60f6cd3 100755 (executable)
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -7,7 +7,7 @@ test_description='our own option parser'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-cat > expect << EOF
+cat >expect <<\EOF

 usage: test-parse-options <options>
 
     --yes                 get a boolean
 usage: test-parse-options <options>
 
     --yes                 get a boolean


@@ -49,14 +49,14 @@ Standard options
 EOF
 
 test_expect_success 'test help' '
 EOF
 
 test_expect_success 'test help' '

-       test_must_fail test-parse-options -h > output 2> output.err &&
+       test_must_fail test-parse-options -h >output 2>output.err &&

        test_must_be_empty output.err &&
        test_i18ncmp expect output
 '
 
 mv expect expect.err
 
        test_must_be_empty output.err &&
        test_i18ncmp expect output
 '
 
 mv expect expect.err
 

-cat >expect.template <<EOF
+cat >expect.template <<\EOF

 boolean: 0
 integer: 0
 magnitude: 0
 boolean: 0
 integer: 0
 magnitude: 0


@@ -156,7 +156,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' '
        check magnitude: 3221225472 -m 3g
 '
 
        check magnitude: 3221225472 -m 3g
 '
 

-cat > expect << EOF
+cat >expect <<\EOF

 boolean: 2
 integer: 1729
 magnitude: 16384
 boolean: 2
 integer: 1729
 magnitude: 16384


@@ -176,7 +176,7 @@ test_expect_success 'short options' '
        test_must_be_empty output.err
 '
 
        test_must_be_empty output.err
 '
 

-cat > expect << EOF
+cat >expect <<\EOF

 boolean: 2
 integer: 1729
 magnitude: 16384
 boolean: 2
 integer: 1729
 magnitude: 16384


@@ -204,7 +204,7 @@ test_expect_success 'missing required value' '
        test_expect_code 129 test-parse-options --file
 '
 
        test_expect_code 129 test-parse-options --file
 '
 

-cat > expect << EOF
+cat >expect <<\EOF

 boolean: 1
 integer: 13
 magnitude: 0
 boolean: 1
 integer: 13
 magnitude: 0


@@ -222,12 +222,12 @@ EOF
 
 test_expect_success 'intermingled arguments' '
        test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
 
 test_expect_success 'intermingled arguments' '
        test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \

-               > output 2> output.err &&
+               >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > expect << EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 2
 magnitude: 0
 boolean: 0
 integer: 2
 magnitude: 0


@@ -241,13 +241,13 @@ file: (not set)
 EOF
 
 test_expect_success 'unambiguously abbreviated option' '
 EOF
 
 test_expect_success 'unambiguously abbreviated option' '

-       test-parse-options --int 2 --boolean --no-bo > output 2> output.err &&
+       test-parse-options --int 2 --boolean --no-bo >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'unambiguously abbreviated option with "="' '
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'unambiguously abbreviated option with "="' '

-       test-parse-options --int=2 > output 2> output.err &&
+       test-parse-options --int=2 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
        test_must_be_empty output.err &&
        test_cmp expect output
 '


@@ -256,7 +256,7 @@ test_expect_success 'ambiguously abbreviated option' '
        test_expect_code 129 test-parse-options --strin 123
 '
 
        test_expect_code 129 test-parse-options --strin 123
 '
 

-cat > expect << EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 0
 magnitude: 0
 boolean: 0
 integer: 0
 magnitude: 0


@@ -270,32 +270,32 @@ file: (not set)
 EOF
 
 test_expect_success 'non ambiguous option (after two options it abbreviates)' '
 EOF
 
 test_expect_success 'non ambiguous option (after two options it abbreviates)' '

-       test-parse-options --st 123 > output 2> output.err &&
+       test-parse-options --st 123 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > typo.err << EOF
-error: did you mean \`--boolean\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--boolean` (with two dashes ?)

 EOF
 
 test_expect_success 'detect possible typos' '
 EOF
 
 test_expect_success 'detect possible typos' '

-       test_must_fail test-parse-options -boolean > output 2> output.err &&
+       test_must_fail test-parse-options -boolean >output 2>output.err &&

        test_must_be_empty output &&
        test_cmp typo.err output.err
 '
 
        test_must_be_empty output &&
        test_cmp typo.err output.err
 '
 

-cat > typo.err << EOF
-error: did you mean \`--ambiguous\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--ambiguous` (with two dashes ?)

 EOF
 
 test_expect_success 'detect possible typos' '
 EOF
 
 test_expect_success 'detect possible typos' '

-       test_must_fail test-parse-options -ambiguous > output 2> output.err &&
+       test_must_fail test-parse-options -ambiguous >output 2>output.err &&

        test_must_be_empty output &&
        test_cmp typo.err output.err
 '
 
        test_must_be_empty output &&
        test_cmp typo.err output.err
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 0
 magnitude: 0
 boolean: 0
 integer: 0
 magnitude: 0


@@ -310,12 +310,12 @@ arg 00: --quux
 EOF
 
 test_expect_success 'keep some options as arguments' '
 EOF
 
 test_expect_success 'keep some options as arguments' '

-       test-parse-options --quux > output 2> output.err &&
+       test-parse-options --quux >output 2>output.err &&

        test_must_be_empty output.err &&
        test_must_be_empty output.err &&

-        test_cmp expect output
+       test_cmp expect output

 '
 
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 0
 magnitude: 0
 boolean: 0
 integer: 0
 magnitude: 0


@@ -331,12 +331,12 @@ EOF
 
 test_expect_success 'OPT_DATE() works' '
        test-parse-options -t "1970-01-01 00:00:01 +0000" \
 
 test_expect_success 'OPT_DATE() works' '
        test-parse-options -t "1970-01-01 00:00:01 +0000" \

-               foo -q > output 2> output.err &&
+               foo -q >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 Callback: "four", 0
 boolean: 5
 integer: 4
 Callback: "four", 0
 boolean: 5
 integer: 4


@@ -351,22 +351,22 @@ file: (not set)
 EOF
 
 test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
 EOF
 
 test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '

-       test-parse-options --length=four -b -4 > output 2> output.err &&
+       test-parse-options --length=four -b -4 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 Callback: "not set", 1
 EOF
 
 test_expect_success 'OPT_CALLBACK() and callback errors work' '
 Callback: "not set", 1
 EOF
 
 test_expect_success 'OPT_CALLBACK() and callback errors work' '

-       test_must_fail test-parse-options --no-length > output 2> output.err &&
+       test_must_fail test-parse-options --no-length >output 2>output.err &&

        test_i18ncmp expect output &&
        test_i18ncmp expect.err output.err
 '
 
        test_i18ncmp expect output &&
        test_i18ncmp expect.err output.err
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 boolean: 1
 integer: 23
 magnitude: 0
 boolean: 1
 integer: 23
 magnitude: 0


@@ -380,18 +380,18 @@ file: (not set)
 EOF
 
 test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
 EOF
 
 test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '

-       test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err &&
+       test-parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '

-       test-parse-options --set23 -bbbbb --neg-or4 > output 2> output.err &&
+       test-parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 boolean: 6
 integer: 0
 magnitude: 0
 boolean: 6
 integer: 0
 magnitude: 0


@@ -405,24 +405,24 @@ file: (not set)
 EOF
 
 test_expect_success 'OPT_BIT() works' '
 EOF
 
 test_expect_success 'OPT_BIT() works' '

-       test-parse-options -bb --or4 > output 2> output.err &&
+       test-parse-options -bb --or4 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() works' '
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() works' '

-       test-parse-options -bb --no-neg-or4 > output 2> output.err &&
+       test-parse-options -bb --no-neg-or4 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '

-       test-parse-options + + + + + + > output 2> output.err &&
+       test-parse-options + + + + + + >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat > expect <<EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 12345
 magnitude: 0
 boolean: 0
 integer: 12345
 magnitude: 0


@@ -436,12 +436,12 @@ file: (not set)
 EOF
 
 test_expect_success 'OPT_NUMBER_CALLBACK() works' '
 EOF
 
 test_expect_success 'OPT_NUMBER_CALLBACK() works' '

-       test-parse-options -12345 > output 2> output.err &&
+       test-parse-options -12345 >output 2>output.err &&

        test_must_be_empty output.err &&
        test_cmp expect output
 '
 
        test_must_be_empty output.err &&
        test_cmp expect output
 '
 

-cat >expect <<EOF
+cat >expect <<\EOF

 boolean: 0
 integer: 0
 magnitude: 0
 boolean: 0
 integer: 0
 magnitude: 0


@@ -460,7 +460,7 @@ test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

-cat >>expect <<'EOF'
+cat >>expect <<\EOF

 list: foo
 list: bar
 list: baz
 list: foo
 list: bar
 list: baz