undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7107: don't use test_must_fail()

Browse Source 
We had a `test_must_fail verify_expect`. However, the git command in
verify_expect() was not expected to fail; the test_cmp() was the failing
command. Be more precise about testing failure by accepting an optional
first argument of '!' which causes the result of the file comparison to
be negated.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2020-07-07 02:04:36 -04:00 committed by Junio C Hamano
parent 6861ac806b
commit c96050ff34
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
t/t7107-reset-pathspec-file.sh
View File

@ -22,7 +22,12 @@ restore_checkpoint () {
verify_expect () {
git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
test_cmp expect actual
if test "x$1" = 'x!'
then
! test_cmp expect actual
else
test_cmp expect actual
fi
}
test_expect_success '--pathspec-from-file from stdin' '
@ -131,7 +136,7 @@ test_expect_success 'quotes not compatible with --pathspec-file-nul' '
cat >expect <<-\EOF &&
D fileA.t
EOF
test_must_fail verify_expect
verify_expect !
'
test_expect_success 'only touches what was listed' '