diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:15 -0800 |
| commit | c7f352f31ad0593f7772a155980b16cbbaac3dec (patch) | |
| tree | c64eb97b8d3846244a534e36ba89093c070da124 /t/t9813-git-p4-preserve-users.sh | |
| parent | Merge branch 'bw/pathspec-cleanup' (diff) | |
| parent | t9813: avoid using pipes (diff) | |
| download | tgif-c7f352f31ad0593f7772a155980b16cbbaac3dec.tar.xz | |
Merge branch 'pb/test-must-fail-is-for-git'
Test cleanup.
* pb/test-must-fail-is-for-git:
t9813: avoid using pipes
don't use test_must_fail with grep
Diffstat (limited to 't/t9813-git-p4-preserve-users.sh')
| -rwxr-xr-x | t/t9813-git-p4-preserve-users.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 0fe2312807..bda222aa02 100755 --- a/t/t9813-git-p4-preserve-users.sh +++ b/t/t9813-git-p4-preserve-users.sh @@ -118,21 +118,21 @@ test_expect_success 'not preserving user with mixed authorship' ' make_change_by_user usernamefile3 Derek derek@example.com && P4EDITOR=cat P4USER=alice P4PASSWD=secret && export P4EDITOR P4USER P4PASSWD && - git p4 commit |\ - grep "git author derek@example.com does not match" && + git p4 commit >actual && + grep "git author derek@example.com does not match" actual && make_change_by_user usernamefile3 Charlie charlie@example.com && - git p4 commit |\ - grep "git author charlie@example.com does not match" && + git p4 commit >actual && + grep "git author charlie@example.com does not match" actual && 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 ) |