Re: [PATCHv4 14/15] Add missing &&'s throughout the testsuite

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 1, 2010, 11:26 UTC
Message-ID: <20101001112647.GF6816@burratino>
In-Reply-To: <1285542879-16381-15-git-send-email-newren@gmail.com>

(+cc: Duy for t1509)

Elijah Newren wrote:

Show 10 quoted lines

> --- a/t/t0003-attributes.sh
> +++ b/t/t0003-attributes.sh
> @@ -19,24 +19,23 @@ attr_check () {
>  test_expect_success 'setup' '
>  
>  	mkdir -p a/b/d a/c &&
> -	(
> -		echo "[attr]notest !test"
> +	cat <<EOF >.gitattributes &&
> +[attr]notest !test

Fits with the style of later tests in the file.  Nice.

[...]

Show 19 quoted lines

> --- a/t/t1509-root-worktree.sh
> +++ b/t/t1509-root-worktree.sh
> @@ -209,7 +209,7 @@ unset GIT_WORK_TREE
>  
>  test_expect_success 'go to /' 'cd /'
>  test_expect_success 'setup' '
> -	rm -rf /.git
> +	rm -rf /.git &&
>  	echo "Initialized empty Git repository in /.git/" > expected &&
>  	git init > result &&
>  	test_cmp expected result
> @@ -232,8 +232,8 @@ say "auto bare gitdir"
>  
>  # DESTROYYYYY!!!!!
>  test_expect_success 'setup' '
> -	rm -rf /refs /objects /info /hooks
> -	rm /*
> +	rm -rf /refs /objects /info /hooks &&
> +	rm /* &&

Hmm, I am not sure I trust this one...

[...]

Show 26 quoted lines

> --- a/t/t3406-rebase-message.sh
> +++ b/t/t3406-rebase-message.sh
> @@ -43,20 +43,20 @@ test_expect_success 'rebase -m' '
>  '
>  
>  test_expect_success 'rebase --stat' '
> -        git reset --hard start
> +	git reset --hard start &&
>          git rebase --stat master >diffstat.txt &&
>          grep "^ fileX |  *1 +$" diffstat.txt
>  '
>  
>  test_expect_success 'rebase w/config rebase.stat' '
> -        git reset --hard start
> +	git reset --hard start &&
>          git config rebase.stat true &&
>          git rebase master >diffstat.txt &&
>          grep "^ fileX |  *1 +$" diffstat.txt
>  '
>  
>  test_expect_success 'rebase -n overrides config rebase.stat config' '
> -        git reset --hard start
> +	git reset --hard start &&
>          git config rebase.stat true &&
>          git rebase -n master >diffstat.txt &&
>          ! grep "^ fileX |  *1 +$" diffstat.txt

Shouldn't these tabs be spaces to blend in with their surroundings?

Show 8 quoted lines

> --- a/t/t4119-apply-config.sh
> +++ b/t/t4119-apply-config.sh
> @@ -73,7 +73,7 @@ D=`pwd`
>  test_expect_success 'apply --whitespace=strip in subdir' '
>  
>  	cd "$D" &&
> -	git config --unset-all apply.whitespace
> +	git config --unset-all apply.whitespace &&

test_might_fail?

Aside from the problems Ævar and Junio found, the rest looks good to me, but I have not tested it. ---

diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index e3391b7..7f60fd0 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -209,7 +209,7 @@ unset GIT_WORK_TREE
 
 test_expect_success 'go to /' 'cd /'
 test_expect_success 'setup' '
-	rm -rf /.git &&
+	rm -rf /.git
 	echo "Initialized empty Git repository in /.git/" > expected &&
 	git init > result &&
 	test_cmp expected result
@@ -232,8 +232,8 @@ say "auto bare gitdir"
 
 # DESTROYYYYY!!!!!
 test_expect_success 'setup' '
-	rm -rf /refs /objects /info /hooks &&
-	rm /* &&
+	rm -rf /refs /objects /info /hooks
+	rm /*
 	cd / &&
 	echo "Initialized empty Git repository in /" > expected &&
 	git init --bare > result &&
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index fe5f936..506d37e 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -43,20 +43,20 @@ test_expect_success 'rebase -m' '
 '
 
 test_expect_success 'rebase --stat' '
-	git reset --hard start &&
+        git reset --hard start &&
         git rebase --stat master >diffstat.txt &&
         grep "^ fileX |  *1 +$" diffstat.txt
 '
 
 test_expect_success 'rebase w/config rebase.stat' '
-	git reset --hard start &&
+        git reset --hard start &&
         git config rebase.stat true &&
         git rebase master >diffstat.txt &&
         grep "^ fileX |  *1 +$" diffstat.txt
 '
 
 test_expect_success 'rebase -n overrides config rebase.stat config' '
-	git reset --hard start &&
+        git reset --hard start &&
         git config rebase.stat true &&
         git rebase -n master >diffstat.txt &&
         ! grep "^ fileX |  *1 +$" diffstat.txt
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 3d0384d..82e0099 100755
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -73,7 +73,7 @@ D=`pwd`
 test_expect_success 'apply --whitespace=strip in subdir' '
 
 	cd "$D" &&
-	git config --unset-all apply.whitespace &&
+	test_might_fail git config --unset-all apply.whitespace &&
 	rm -f sub/file1 &&
 	cp saved sub/file1 &&
 	git update-index --refresh &&