t6016 (rev-list-graph-simplify-history): add missing &&

Also move repeated tag and branch deletions into a separate setup test, to
avoid failures from tags and branches having already been deleted.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
index 27fd52b7be8ee8a084bc96bd606813cc556c4bb0..f7181d1d6a143c60a5c4b26960bd42aa2c88035d 100755 (executable)
--- a/t/t6016-rev-list-graph-simplify-history.sh
+++ b/t/t6016-rev-list-graph-simplify-history.sh
@@ -29,7 +29,7 @@ test_expect_success 'set up rev-list --graph test' '
        # Octopus merge B and C into branch A
        git checkout A &&
        git merge B C &&
        # Octopus merge B and C into branch A
        git checkout A &&
        git merge B C &&

-       git tag A4
+       git tag A4 &&

 
        test_commit A5 bar.txt &&
 
 
        test_commit A5 bar.txt &&
 


@@ -39,7 +39,7 @@ test_expect_success 'set up rev-list --graph test' '
        test_commit C4 bar.txt &&
        git checkout A &&
        git merge -s ours C &&
        test_commit C4 bar.txt &&
        git checkout A &&
        git merge -s ours C &&

-       git tag A6
+       git tag A6 &&

 
        test_commit A7 bar.txt &&
 
 
        test_commit A7 bar.txt &&
 


@@ -90,7 +90,7 @@ test_expect_success '--graph --all' '
 # that undecorated merges are interesting, even with --simplify-by-decoration
 test_expect_success '--graph --simplify-by-decoration' '
        rm -f expected &&
 # that undecorated merges are interesting, even with --simplify-by-decoration
 test_expect_success '--graph --simplify-by-decoration' '
        rm -f expected &&

-       git tag -d A4
+       git tag -d A4 &&

        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&
        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&


@@ -116,12 +116,15 @@ test_expect_success '--graph --simplify-by-decoration' '
        test_cmp expected actual
        '
 
        test_cmp expected actual
        '
 

-# Get rid of all decorations on branch B, and graph with it simplified away
+test_expect_success 'setup: get rid of decorations on B' '
+       git tag -d B2 &&
+       git tag -d B1 &&
+       git branch -d B
+'
+
+# Graph with branch B simplified away

 test_expect_success '--graph --simplify-by-decoration prune branch B' '
        rm -f expected &&
 test_expect_success '--graph --simplify-by-decoration prune branch B' '
        rm -f expected &&

-       git tag -d B2
-       git tag -d B1
-       git branch -d B

        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&
        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&


@@ -143,9 +146,6 @@ test_expect_success '--graph --simplify-by-decoration prune branch B' '
 
 test_expect_success '--graph --full-history -- bar.txt' '
        rm -f expected &&
 
 test_expect_success '--graph --full-history -- bar.txt' '
        rm -f expected &&

-       git tag -d B2
-       git tag -d B1
-       git branch -d B

        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&
        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&


@@ -163,9 +163,6 @@ test_expect_success '--graph --full-history -- bar.txt' '
 
 test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
        rm -f expected &&
 
 test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
        rm -f expected &&

-       git tag -d B2
-       git tag -d B1
-       git branch -d B

        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&
        echo "* $A7" >> expected &&
        echo "*   $A6" >> expected &&
        echo "|\\  " >> expected &&


@@ -181,9 +178,6 @@ test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
 
 test_expect_success '--graph -- bar.txt' '
        rm -f expected &&
 
 test_expect_success '--graph -- bar.txt' '
        rm -f expected &&

-       git tag -d B2
-       git tag -d B1
-       git branch -d B

        echo "* $A7" >> expected &&
        echo "* $A5" >> expected &&
        echo "* $A3" >> expected &&
        echo "* $A7" >> expected &&
        echo "* $A5" >> expected &&
        echo "* $A3" >> expected &&


@@ -196,9 +190,6 @@ test_expect_success '--graph -- bar.txt' '
 
 test_expect_success '--graph --sparse -- bar.txt' '
        rm -f expected &&
 
 test_expect_success '--graph --sparse -- bar.txt' '
        rm -f expected &&

-       git tag -d B2
-       git tag -d B1
-       git branch -d B

        echo "* $A7" >> expected &&
        echo "* $A6" >> expected &&
        echo "* $A5" >> expected &&
        echo "* $A7" >> expected &&
        echo "* $A6" >> expected &&
        echo "* $A5" >> expected &&