Merge branch 'bc/maint-apply-check-no-patch' into maint

[git.git] / t / t7602-merge-octopus-many.sh

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 2746169514f9bd1629f05eed8f9ff2fcfdba8cb5..61f36baa1f3459d68ac30e67680e096093cbe414 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -31,7 +31,7 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
        do
                refs="$refs c$i"
                i=`expr $i + 1`
        do
                refs="$refs c$i"
                i=`expr $i + 1`

-       done
+       done &&

        git merge $refs &&
        test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
        i=1 &&
        git merge $refs &&
        test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
        i=1 &&


@@ -53,7 +53,7 @@ cat >expected <<\EOF
 Trying simple merge with c2
 Trying simple merge with c3
 Trying simple merge with c4
 Trying simple merge with c2
 Trying simple merge with c3
 Trying simple merge with c4

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c2.c |    1 +
  c3.c |    1 +
  c4.c |    1 +
  c2.c |    1 +
  c3.c |    1 +
  c4.c |    1 +


@@ -72,7 +72,7 @@ test_expect_success 'merge output uses pretty names' '
 cat >expected <<\EOF
 Already up-to-date with c4
 Trying simple merge with c5
 cat >expected <<\EOF
 Already up-to-date with c4
 Trying simple merge with c5

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c5.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 c5.c
  c5.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 c5.c


@@ -86,7 +86,7 @@ test_expect_success 'merge up-to-date output uses pretty names' '
 cat >expected <<\EOF
 Fast-forwarding to: c1
 Trying simple merge with c2
 cat >expected <<\EOF
 Fast-forwarding to: c1
 Trying simple merge with c2

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c1.c |    1 +
  c2.c |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
  c1.c |    1 +
  c2.c |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)