[PATCH 4/6] t3200 (branch): fix '&&' chaining
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:52:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix these breaks. Additionally, note that 'git branch --help' will fail when git manpages aren't already installed: guard the line with a 'test_might_fail'. Helped-by: Jonathan Nieder [off-list ref] Signed-off-by: Ramkumar Ramachandra <redacted> --- 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