Re: [PATCHv4 10/15] t6016 (rev-list-graph-simplify-history): add missing &&

From

Jonathan Nieder <jrnieder@gmail.com>

Date

Sep 27, 2010, 00:10 UTC

Message-ID

<20100927001037.GA7490@burratino>

In-Reply-To

<1285542879-16381-11-git-send-email-newren@gmail.com>

Thanks for doing this tedious work.

Elijah Newren wrote:

> Also removed several repeated tag and branch deletions

Nit: present tense

> , since the tags and
> branches had already been deleted.

The rest looks good to me, for what it's worth.

diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
index e640c41..5036940 100755
--- a/t/t6016-rev-list-graph-simplify-history.sh
+++ b/t/t6016-rev-list-graph-simplify-history.sh
@@ -116,12 +116,15 @@ test_expect_success '--graph --simplify-by-decoration' '
 	test_cmp expected actual
 	'
 
-# Get rid of all decorations on branch B, and graph with it simplified away
-test_expect_success '--graph --simplify-by-decoration prune branch B' '
-	rm -f expected &&
+test_expect_success 'setup: get rid of decorations on branch B' '
 	git tag -d B2 &&
 	git tag -d B1 &&
-	git branch -d B &&
+	git branch -d B
+'
+
+# Graph with branch B simplified away.
+test_expect_success '--graph --simplify-by-decoration prune branch B' '
+	rm -f expected &&
 	echo "* $A7" >> expected &&
 	echo "*   $A6" >> expected &&
 	echo "|\\  " >> expected &&