diff options
Diffstat (limited to 't/t9813-git-p4-preserve-users.sh')
| -rwxr-xr-x | t/t9813-git-p4-preserve-users.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 0fe2312807..76004a5ad6 100755 --- a/t/t9813-git-p4-preserve-users.sh +++ b/t/t9813-git-p4-preserve-users.sh @@ -126,13 +126,13 @@ test_expect_success 'not preserving user with mixed authorship' ' grep "git author charlie@example.com does not match" && make_change_by_user usernamefile3 alice alice@example.com && - git p4 commit |\ - test_must_fail grep "git author.*does not match" && + git p4 commit >actual && + ! grep "git author.*does not match" actual && git config git-p4.skipUserNameCheck true && make_change_by_user usernamefile3 Charlie charlie@example.com && - git p4 commit |\ - test_must_fail grep "git author.*does not match" && + git p4 commit >actual && + ! grep "git author.*does not match" actual && p4_check_commit_author usernamefile3 alice ) |