t3701: indent here documents

Indent here documents in line with the current style for tests.
While at it, quote the end marker of here-docs that do not use
variable interpolation.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index a49c12c79b28fac8545dffcbaba8e8905c8d6222..39c742306994e029575f67bdfa8390f4682d8e2d 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -22,14 +22,14 @@ test_expect_success 'status works (initial)' '
 '
 
 test_expect_success 'setup expected' '
 '
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-new file mode 100644
-index 0000000..d95f3ad
---- /dev/null
-+++ b/file
-@@ -0,0 +1 @@
-+content
-EOF
+       cat >expected <<-\EOF
+       new file mode 100644
+       index 0000000..d95f3ad
+       --- /dev/null
+       +++ b/file
+       @@ -0,0 +1 @@
+       +content
+       EOF

 '
 
 test_expect_success 'diff works (initial)' '
 '
 
 test_expect_success 'diff works (initial)' '


@@ -59,14 +59,14 @@ test_expect_success 'status works (commit)' '
 '
 
 test_expect_success 'setup expected' '
 '
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-index 180b47c..b6f2c08 100644
---- a/file
-+++ b/file
-@@ -1 +1,2 @@
- baseline
-+content
-EOF
+       cat >expected <<-\EOF
+       index 180b47c..b6f2c08 100644
+       --- a/file
+       +++ b/file
+       @@ -1 +1,2 @@
+        baseline
+       +content
+       EOF

 '
 
 test_expect_success 'diff works (commit)' '
 '
 
 test_expect_success 'diff works (commit)' '


@@ -83,8 +83,8 @@ test_expect_success 'revert works (commit)' '
 
 
 test_expect_success 'setup expected' '
 
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-EOF
+       cat >expected <<-\EOF
+       EOF

 '
 
 test_expect_success 'setup fake editor' '
 '
 
 test_expect_success 'setup fake editor' '


@@ -100,21 +100,21 @@ test_expect_success 'dummy edit works' '
 '
 
 test_expect_success 'setup patch' '
 '
 
 test_expect_success 'setup patch' '

-cat >patch <<EOF
-@@ -1,1 +1,4 @@
- this
-+patch
--does not
- apply
-EOF
+       cat >patch <<-\EOF
+       @@ -1,1 +1,4 @@
+        this
+       +patch
+       -does not
+        apply
+       EOF

 '
 
 test_expect_success 'setup fake editor' '
        echo "#!$SHELL_PATH" >fake_editor.sh &&
 '
 
 test_expect_success 'setup fake editor' '
        echo "#!$SHELL_PATH" >fake_editor.sh &&

-       cat >>fake_editor.sh <<\EOF &&
-mv -f "$1" oldpatch &&
-mv -f patch "$1"
-EOF
+       cat >>fake_editor.sh <<-\EOF &&
+       mv -f "$1" oldpatch &&
+       mv -f patch "$1"
+       EOF

        chmod a+x fake_editor.sh &&
        test_set_editor "$(pwd)/fake_editor.sh"
 '
        chmod a+x fake_editor.sh &&
        test_set_editor "$(pwd)/fake_editor.sh"
 '


@@ -126,10 +126,10 @@ test_expect_success 'bad edit rejected' '
 '
 
 test_expect_success 'setup patch' '
 '
 
 test_expect_success 'setup patch' '

-cat >patch <<EOF
-this patch
-is garbage
-EOF
+       cat >patch <<-\EOF
+       this patch
+       is garbage
+       EOF

 '
 
 test_expect_success 'garbage edit rejected' '
 '
 
 test_expect_success 'garbage edit rejected' '


@@ -139,28 +139,28 @@ test_expect_success 'garbage edit rejected' '
 '
 
 test_expect_success 'setup patch' '
 '
 
 test_expect_success 'setup patch' '

-cat >patch <<EOF
-@@ -1,0 +1,0 @@
- baseline
-+content
-+newcontent
-+lines
-EOF
+       cat >patch <<-\EOF
+       @@ -1,0 +1,0 @@
+        baseline
+       +content
+       +newcontent
+       +lines
+       EOF

 '
 
 test_expect_success 'setup expected' '
 '
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-diff --git a/file b/file
-index b5dd6c9..f910ae9 100644
---- a/file
-+++ b/file
-@@ -1,4 +1,4 @@
- baseline
- content
--newcontent
-+more
- lines
-EOF
+       cat >expected <<-\EOF
+       diff --git a/file b/file
+       index b5dd6c9..f910ae9 100644
+       --- a/file
+       +++ b/file
+       @@ -1,4 +1,4 @@
+        baseline
+        content
+       -newcontent
+       +more
+        lines
+       EOF

 '
 
 test_expect_success 'real edit works' '
 '
 
 test_expect_success 'real edit works' '


@@ -222,31 +222,31 @@ test_expect_success 'setup again' '
 
 # Write the patch file with a new line at the top and bottom
 test_expect_success 'setup patch' '
 
 # Write the patch file with a new line at the top and bottom
 test_expect_success 'setup patch' '

-cat >patch <<EOF
-index 180b47c..b6f2c08 100644
---- a/file
-+++ b/file
-@@ -1,2 +1,4 @@
-+firstline
- baseline
- content
-+lastline
-EOF
+       cat >patch <<-\EOF
+       index 180b47c..b6f2c08 100644
+       --- a/file
+       +++ b/file
+       @@ -1,2 +1,4 @@
+       +firstline
+        baseline
+        content
+       +lastline
+       EOF

 '
 
 # Expected output, similar to the patch but w/ diff at the top
 test_expect_success 'setup expected' '
 '
 
 # Expected output, similar to the patch but w/ diff at the top
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-diff --git a/file b/file
-index b6f2c08..61b9053 100755
---- a/file
-+++ b/file
-@@ -1,2 +1,4 @@
-+firstline
- baseline
- content
-+lastline
-EOF
+       cat >expected <<-\EOF
+       diff --git a/file b/file
+       index b6f2c08..61b9053 100755
+       --- a/file
+       +++ b/file
+       @@ -1,2 +1,4 @@
+       +firstline
+        baseline
+        content
+       +lastline
+       EOF

 '
 
 # Test splitting the first patch, then adding both
 '
 
 # Test splitting the first patch, then adding both


@@ -259,15 +259,15 @@ test_expect_success 'add first line works' '
 '
 
 test_expect_success 'setup expected' '
 '
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-diff --git a/non-empty b/non-empty
-deleted file mode 100644
-index d95f3ad..0000000
---- a/non-empty
-+++ /dev/null
-@@ -1 +0,0 @@
--content
-EOF
+       cat >expected <<-\EOF
+       diff --git a/non-empty b/non-empty
+       deleted file mode 100644
+       index d95f3ad..0000000
+       --- a/non-empty
+       +++ /dev/null
+       @@ -1 +0,0 @@
+       -content
+       EOF

 '
 
 test_expect_success 'deleting a non-empty file' '
 '
 
 test_expect_success 'deleting a non-empty file' '


@@ -282,11 +282,11 @@ test_expect_success 'deleting a non-empty file' '
 '
 
 test_expect_success 'setup expected' '
 '
 
 test_expect_success 'setup expected' '

-cat >expected <<EOF
-diff --git a/empty b/empty
-deleted file mode 100644
-index e69de29..0000000
-EOF
+       cat >expected <<-\EOF
+       diff --git a/empty b/empty
+       deleted file mode 100644
+       index e69de29..0000000
+       EOF

 '
 
 test_expect_success 'deleting an empty file' '
 '
 
 test_expect_success 'deleting an empty file' '