summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-12-08 18:40:15 +0530
committerJunio C Hamano <gitster@pobox.com>2011-12-08 16:01:47 -0800
commit2f139044f96227deb8332942627a04b29c70c2bf (patch)
tree2fad330f7671004d3fc178e7c516de8c56a3df8f /t/t3200-branch.sh
parent4cb5d10b14dcbe0155bed9c45ccb94e83bd4c599 (diff)
downloadgit-2f139044f96227deb8332942627a04b29c70c2bf.tar.gz
t3200 (branch): fix '&&' chaining
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix these breaks. The 'git branch --help' in the test may fail if git manual pages are not installed, but the point of the test is to make sure it does not create a bogus branch "--help", so run it under 'test_might_fail'. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index bc73c2099b..724ff9de4b 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' '