summaryrefslogtreecommitdiff
path: root/t/t4133-apply-filenames.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-10-30 20:46:54 -0500
committerJunio C Hamano <gitster@pobox.com>2010-11-09 11:59:49 -0800
commita48fcd836971d065b9bf16b8cd046fd1aff9b279 (patch)
tree34f868252e96a6cf1f7fe02014977f7fbb12d4c3 /t/t4133-apply-filenames.sh
parent00648ba0505bbe1999bb6ae2f1d02a0ef923b191 (diff)
downloadgit-a48fcd836971d065b9bf16b8cd046fd1aff9b279.tar.gz
tests: add missing &&
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Commands intended to fail should be marked with !, test_must_fail, or test_might_fail. The examples in this patch do not require that. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4133-apply-filenames.sh')
-rwxr-xr-xt/t4133-apply-filenames.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index 34218071b6..94da99075c 100755
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -8,7 +8,7 @@ test_description='git apply filename consistency check'
. ./test-lib.sh
test_expect_success setup '
- cat > bad1.patch <<EOF
+ cat > bad1.patch <<EOF &&
diff --git a/f b/f
new file mode 100644
index 0000000..d00491f
@@ -29,9 +29,9 @@ EOF
'
test_expect_success 'apply diff with inconsistent filenames in headers' '
- test_must_fail git apply bad1.patch 2>err
- grep "inconsistent new filename" err
- test_must_fail git apply bad2.patch 2>err
+ test_must_fail git apply bad1.patch 2>err &&
+ grep "inconsistent new filename" err &&
+ test_must_fail git apply bad2.patch 2>err &&
grep "inconsistent old filename" err
'