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>
Ramkumar Ramachandra committed
Dec 8, 2011 at 18:40 UTC
2f139044f96227deb8332942627a04b29c70c2bf
1 file changed
+2
-2
t/t3200-branch.sh
+2
-2
@@ -22,7 +22,7 @@ test_expect_success \
22
23
test_expect_success \
24
'git branch --help should not have created a bogus branch' '
25
- git branch --help </dev/null >/dev/null 2>/dev/null;
25
+ test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
26
test_path_is_missing .git/refs/heads/--help
27
'
28
@@ -88,7 +88,7 @@ test_expect_success \
88
test_expect_success \
89
'git branch -m n/n n should work' \
90
'git branch -l n/n &&
91
- git branch -m n/n n
91
+ git branch -m n/n n &&
92
test_path_is_file .git/logs/refs/heads/n'
93
94
test_expect_success 'git branch -m o/o o should fail when o/p exists' '