t7600 (merge): modernize style

Guard setup commands with test_expect_success, so they are easier
to visually skip over and get to the good part.  While at it:

 - use "printf '%s\n' a b ..." instead of "cat <<EOF" for test
   vectors with short lines;

 - use test_cmp instead of test foo = bar where possible, for
   better output with -v on failure;

 - do not go to extraordinary lengths to print a relevant message
   when test commands fail.  There is a patch in flight that could be
   used to restore the nice error messages in a cleaner way.

Cc: Lars Hjemli <hjemli@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 16e5ba1d8cb9c10fc45bdf7fd3ea6d5d2acaac22..48a91ba3ca69b25874f9e6899381c40ef6322145 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -5,189 +5,103 @@
 
 test_description='git merge
 
-Testing basic merge operations/option parsing.'
+Testing basic merge operations/option parsing.
+
+! [c0] commit 0
+ ! [c1] commit 1
+  ! [c2] commit 2
+   ! [c3] commit 3
+    ! [c4] c4
+     ! [c5] c5
+      ! [c6] c6
+       * [master] Merge commit 'c1'
+--------
+       - [master] Merge commit 'c1'
+ +     * [c1] commit 1
+      +  [c6] c6
+     +   [c5] c5
+    ++   [c4] c4
+   ++++  [c3] commit 3
+  +      [c2] commit 2
++++++++* [c0] commit 0
+'
 
 . ./test-lib.sh
 
-cat >file <<EOF
-1
-2
-3
-4
-5
-6
-7
-8
-9
-EOF
-
-cat >file.1 <<EOF
-1 X
-2
-3
-4
-5
-6
-7
-8
-9
-EOF
-
-cat >file.5 <<EOF
-1
-2
-3
-4
-5 X
-6
-7
-8
-9
-EOF
-
-cat >file.9 <<EOF
-1
-2
-3
-4
-5
-6
-7
-8
-9 X
-EOF
-
-cat  >result.1 <<EOF
-1 X
-2
-3
-4
-5
-6
-7
-8
-9
-EOF
-
-cat >result.1-5 <<EOF
-1 X
-2
-3
-4
-5 X
-6
-7
-8
-9
-EOF
-
-cat >result.1-5-9 <<EOF
-1 X
-2
-3
-4
-5 X
-6
-7
-8
-9 X
-EOF
-
-create_merge_msgs() {
-       echo "Merge commit 'c2'" >msg.1-5 &&
-       echo "Merge commit 'c2'; commit 'c3'" >msg.1-5-9 &&
-       echo "Squashed commit of the following:" >squash.1 &&
-       echo >>squash.1 &&
-       git log --no-merges ^HEAD c1 >>squash.1 &&
-       echo "Squashed commit of the following:" >squash.1-5 &&
-       echo >>squash.1-5 &&
-       git log --no-merges ^HEAD c2 >>squash.1-5 &&
-       echo "Squashed commit of the following:" >squash.1-5-9 &&
-       echo >>squash.1-5-9 &&
-       git log --no-merges ^HEAD c2 c3 >>squash.1-5-9 &&
-       echo > msg.nolog &&
-       echo "* commit 'c3':" >msg.log &&
-       echo "  commit 3" >>msg.log &&
-       echo >>msg.log
-}
-
-verify_diff() {
-       if ! test_cmp "$1" "$2"
-       then
-               echo "$3"
-               false
-       fi
-}
-
-verify_merge() {
-       verify_diff "$2" "$1" "[OOPS] bad merge result" &&
-       if test $(git ls-files -u | wc -l) -gt 0
-       then
-               echo "[OOPS] unmerged files"
-               false
-       fi &&
-       if test_must_fail git diff --exit-code
-       then
-               echo "[OOPS] working tree != index"
-               false
-       fi &&
-       if test -n "$3"
-       then
-               git show -s --pretty=format:%s HEAD >msg.act &&
-               verify_diff "$3" msg.act "[OOPS] bad merge message"
-       fi
-}
-
-verify_head() {
-       if test "$1" != "$(git rev-parse HEAD)"
-       then
-               echo "[OOPS] HEAD != $1"
-               false
-       fi
-}
-
-verify_parents() {
-       i=1
-       while test $# -gt 0
-       do
-               if test "$1" != "$(git rev-parse HEAD^$i)"
+test_expect_success 'set up test data and helpers' '
+       printf "%s\n" 1 2 3 4 5 6 7 8 9 >file &&
+       printf "%s\n" "1 X" 2 3 4 5 6 7 8 9 >file.1 &&
+       printf "%s\n" 1 2 3 4 "5 X" 6 7 8 9 >file.5 &&
+       printf "%s\n" 1 2 3 4 5 6 7 8 "9 X" >file.9 &&
+       printf "%s\n" "1 X" 2 3 4 5 6 7 8 9 >result.1 &&
+       printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 9 >result.1-5 &&
+       printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 "9 X" >result.1-5-9 &&
+
+       create_merge_msgs() {
+               echo "Merge commit '\''c2'\''" >msg.1-5 &&
+               echo "Merge commit '\''c2'\''; commit '\''c3'\''" >msg.1-5-9 &&
+               {
+                       echo "Squashed commit of the following:" &&
+                       echo &&
+                       git log --no-merges ^HEAD c1
+               } >squash.1 &&
+               {
+                       echo "Squashed commit of the following:" &&
+                       echo &&
+                       git log --no-merges ^HEAD c2
+               } >squash.1-5 &&
+               {
+                       echo "Squashed commit of the following:" &&
+                       echo &&
+                       git log --no-merges ^HEAD c2 c3
+               } >squash.1-5-9 &&
+               echo >msg.nolog &&
+               {
+                       echo "* commit '\''c3'\'':" &&
+                       echo "  commit 3" &&
+                       echo
+               } >msg.log
+       } &&
+
+       verify_merge() {
+               test_cmp "$2" "$1" &&
+               git update-index --refresh &&
+               git diff --exit-code &&
+               if test -n "$3"
                then
-                       echo "[OOPS] HEAD^$i != $1"
-                       return 1
+                       git show -s --pretty=format:%s HEAD >msg.act &&
+                       test_cmp "$3" msg.act
                fi
-               i=$(expr $i + 1)
-               shift
-       done
-}
-
-verify_mergeheads() {
-       i=1
-       if ! test -f .git/MERGE_HEAD
-       then
-               echo "[OOPS] MERGE_HEAD is missing"
-               false
-       fi &&
-       while test $# -gt 0
-       do
-               head=$(head -n $i .git/MERGE_HEAD | sed -ne \$p)
-               if test "$1" != "$head"
-               then
-                       echo "[OOPS] MERGE_HEAD $i != $1"
+       } &&
+
+       verify_head() {
+               echo "$1" >head.expected &&
+               git rev-parse HEAD >head.actual &&
+               test_cmp head.expected head.actual
+       } &&
+
+       verify_parents() {
+               printf "%s\n" "$@" >parents.expected &&
+               >parents.actual &&
+               i=1 &&
+               while test $i -le $#
+               do
+                       git rev-parse HEAD^$i >>parents.actual &&
+                       i=$(expr $i + 1) ||
                        return 1
-               fi
-               i=$(expr $i + 1)
-               shift
-       done
-}
+               done &&
+               test_cmp parents.expected parents.actual
+       } &&
 
-verify_no_mergehead() {
-       if test -f .git/MERGE_HEAD
-       then
-               echo "[OOPS] MERGE_HEAD exists"
-               false
-       fi
-}
+       verify_mergeheads() {
+               printf "%s\n" "$@" >mergehead.expected &&
+               test_cmp mergehead.expected .git/MERGE_HEAD
+       } &&
 
+       verify_no_mergehead() {
+               ! test -e .git/MERGE_HEAD
+       }
+'
 
 test_expect_success 'setup' '
        git add file &&
@@ -316,7 +230,7 @@ test_expect_success 'merge c0 with c1 (squash)' '
        verify_merge file result.1 &&
        verify_head $c0 &&
        verify_no_mergehead &&
-       verify_diff squash.1 .git/SQUASH_MSG "[OOPS] bad squash message"
+       test_cmp squash.1 .git/SQUASH_MSG
 '
 
 test_debug 'gitk --all'
@@ -327,7 +241,7 @@ test_expect_success 'merge c0 with c1 (squash, ff-only)' '
        verify_merge file result.1 &&
        verify_head $c0 &&
        verify_no_mergehead &&
-       verify_diff squash.1 .git/SQUASH_MSG "[OOPS] bad squash message"
+       test_cmp squash.1 .git/SQUASH_MSG
 '
 
 test_debug 'gitk --all'
@@ -338,7 +252,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
        verify_merge file result.1-5 &&
        verify_head $c1 &&
        verify_no_mergehead &&
-       verify_diff squash.1-5 .git/SQUASH_MSG "[OOPS] bad squash message"
+       test_cmp squash.1-5 .git/SQUASH_MSG
 '
 
 test_debug 'gitk --all'
@@ -356,7 +270,7 @@ test_expect_success 'merge c1 with c2 and c3 (squash)' '
        verify_merge file result.1-5-9 &&
        verify_head $c1 &&
        verify_no_mergehead &&
-       verify_diff squash.1-5-9 .git/SQUASH_MSG "[OOPS] bad squash message"
+       test_cmp squash.1-5-9 .git/SQUASH_MSG
 '
 
 test_debug 'gitk --all'
@@ -379,7 +293,7 @@ test_expect_success 'merge c1 with c2 (squash in config)' '
        verify_merge file result.1-5 &&
        verify_head $c1 &&
        verify_no_mergehead &&
-       verify_diff squash.1-5 .git/SQUASH_MSG "[OOPS] bad squash message"
+       test_cmp squash.1-5 .git/SQUASH_MSG
 '
 
 test_debug 'gitk --all'
@@ -485,17 +399,17 @@ test_expect_success 'merge log message' '
        git reset --hard c0 &&
        git merge --no-log c2 &&
        git show -s --pretty=format:%b HEAD >msg.act &&
-       verify_diff msg.nolog msg.act "[OOPS] bad merge log message" &&
+       test_cmp msg.nolog msg.act &&
 
        git merge --log c3 &&
        git show -s --pretty=format:%b HEAD >msg.act &&
-       verify_diff msg.log msg.act "[OOPS] bad merge log message" &&
+       test_cmp msg.log msg.act &&
 
        git reset --hard HEAD^ &&
        git config merge.log yes &&
        git merge c3 &&
        git show -s --pretty=format:%b HEAD >msg.act &&
-       verify_diff msg.log msg.act "[OOPS] bad merge log message"
+       test_cmp msg.log msg.act
 '
 
 test_debug 'gitk --all'
@@ -545,7 +459,7 @@ test_debug 'gitk --all'
 
 test_expect_success 'in-index merge' '
        git reset --hard c0 &&
-       git merge --no-ff -s resolve c1 > out &&
+       git merge --no-ff -s resolve c1 >out &&
        grep "Wonderful." out &&
        verify_parents $c0 $c1
 '
@@ -567,16 +481,16 @@ EOF
 
 test_expect_success 'merge early part of c2' '
        git reset --hard c3 &&
-       echo c4 > c4.c &&
+       echo c4 >c4.c &&
        git add c4.c &&
        git commit -m c4 &&
        git tag c4 &&
-       echo c5 > c5.c &&
+       echo c5 >c5.c &&
        git add c5.c &&
        git commit -m c5 &&
        git tag c5 &&
        git reset --hard c3 &&
-       echo c6 > c6.c &&
+       echo c6 >c6.c &&
        git add c6.c &&
        git commit -m c6 &&
        git tag c6 &&