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>
This commit is contained in:
parent
4cb5d10b14
commit
2f139044f9
@ -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' '
|
||||
|
Loading…
Reference in New Issue
Block a user