summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorPranit Bauva <pranit.bauva@gmail.com>2017-01-04 01:27:08 +0530
committerJunio C Hamano <gitster@pobox.com>2017-01-09 01:54:47 -0800
commitc6f44e1da5e88e34654ae37c62eea2d08835110b (patch)
tree261372c7b65ee30009d34925571d7a09d108c330 /t
parentc7cf956618c4af9f3151a90d7552b05767e6444f (diff)
downloadgit-c6f44e1da5e88e34654ae37c62eea2d08835110b.tar.gz
t9813: avoid using pipespb/test-must-fail-is-for-git
The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t9813-git-p4-preserve-users.sh8
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 76004a5ad6..bda222aa02 100755
--- a/t/t9813-git-p4-preserve-users.sh
+++ b/t/t9813-git-p4-preserve-users.sh
@@ -118,12 +118,12 @@ 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 >actual &&