[PATCH 4/6] t3200 (branch): fix '&&' chaining

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Dec 9, 2011, 11:29 UTC
Message-ID: <1323430158-14885-5-git-send-email-artagnon@gmail.com>
In-Reply-To: <1323430158-14885-1-git-send-email-artagnon@gmail.com>

Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix these breaks.

'git branch --help' will fail when git manpages aren't already installed; now that its status is tested, guard these instances with 'test_might_fail'.

Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t3200-branch.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index bc73c20..95066d0 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -22,7 +22,7 @@ test_expect_success \
 
 test_expect_success \
     'git branch --help should not have created a bogus branch' '
-     git branch --help </dev/null >/dev/null 2>/dev/null;
+     test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
      test_path_is_missing .git/refs/heads/--help
 '
 
@@ -88,7 +88,7 @@ test_expect_success \
 test_expect_success \
     'git branch -m n/n n should work' \
        'git branch -l n/n &&
-        git branch -m n/n n
+        git branch -m n/n n &&
 	test_path_is_file .git/logs/refs/heads/n'
 
 test_expect_success 'git branch -m o/o o should fail when o/p exists' '

-- 
1.7.7.3