t5407: use <<- to align the expected output

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index 06ffad6a287a6592ca5dd8fe0d9bdc9be9672cd5..7a48236e87695d947c7c3f166e1d291cd3b7a05b 100755 (executable)
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -61,10 +61,10 @@ test_expect_success 'git rebase' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD^)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD^)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -77,9 +77,9 @@ test_expect_success 'git rebase --skip' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -89,9 +89,9 @@ test_expect_success 'git rebase --skip the last one' '
        test_must_fail git rebase --onto D A &&
        git rebase --skip &&
        echo rebase >expected.args &&
        test_must_fail git rebase --onto D A &&
        git rebase --skip &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse E) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse E) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -103,10 +103,10 @@ test_expect_success 'git rebase -m' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD^)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD^)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -119,9 +119,9 @@ test_expect_success 'git rebase -m --skip' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -148,10 +148,10 @@ test_expect_success 'git rebase -i (unchanged)' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD^)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD^)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -163,9 +163,9 @@ test_expect_success 'git rebase -i (skip)' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -177,10 +177,10 @@ test_expect_success 'git rebase -i (squash)' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -189,10 +189,10 @@ test_expect_success 'git rebase -i (fixup without conflict)' '
        clear_hook_input &&
        FAKE_LINES="1 fixup 2" git rebase -i B &&
        echo rebase >expected.args &&
        clear_hook_input &&
        FAKE_LINES="1 fixup 2" git rebase -i B &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -205,10 +205,10 @@ test_expect_success 'git rebase -i (double edit)' '
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&
        git add foo &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD^)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD^)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '
 


@@ -222,10 +222,10 @@ test_expect_success 'git rebase -i (exec)' '
        test_must_fail git rebase --continue &&
        git rebase --continue &&
        echo rebase >expected.args &&
        test_must_fail git rebase --continue &&
        git rebase --continue &&
        echo rebase >expected.args &&

-       cat >expected.data <<EOF &&
-$(git rev-parse C) $(git rev-parse HEAD^)
-$(git rev-parse D) $(git rev-parse HEAD)
-EOF
+       cat >expected.data <<-EOF &&
+       $(git rev-parse C) $(git rev-parse HEAD^)
+       $(git rev-parse D) $(git rev-parse HEAD)
+       EOF

        verify_hook_input
 '
 
        verify_hook_input
 '