summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2010-07-20 15:24:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-20 18:37:26 (GMT)
commit460d562eab00070dfeb54f6ecbf803ad14aed4a5 (patch)
treea65fd62bdd347cf02290db6b3556865405f32cbe
parent5f7baac1e34440d3805ef488c97af748f3c20640 (diff)
downloadgit-460d562eab00070dfeb54f6ecbf803ad14aed4a5.zip
git-460d562eab00070dfeb54f6ecbf803ad14aed4a5.tar.gz
git-460d562eab00070dfeb54f6ecbf803ad14aed4a5.tar.bz2
t/t3700: convert two uses of negation operator '!' to use test_must_fail
These two lines use the negation '!' operator to negate the result of a simple command. Since these commands do not contain any pipes or other complexities, the test_must_fail function can be used and is preferred since it will additionally detect termination due to a signal. This was noticed because the second use of '!' does not include a space between the '!' and the opening parens. Ksh interprets this as follows: !(pattern-list) Matches anything except one of the given patterns. Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3700-add.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 47fbf53..d03495d 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -268,7 +268,7 @@ test_expect_success 'git add --dry-run of existing changed file' "
test_expect_success 'git add --dry-run of non-existing file' "
echo ignored-file >>.gitignore &&
- ! (git add --dry-run track-this ignored-file >actual 2>&1) &&
+ test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 &&
echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual
"
@@ -281,7 +281,7 @@ add 'track-this'
EOF
test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
- !(git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1) &&
+ test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1 &&
test_cmp expect actual
'