On 3 January 2017 at 19:57, Pranit Bauva <pranit.bauva@xxxxxxxxx> wrote: > 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. Do we also need to fix t9814-git-p4-rename.sh ? > > Signed-off-by: Pranit Bauva <pranit.bauva@xxxxxxxxx> > --- > t/t9813-git-p4-preserve-users.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh > index 798bf2b67..2133b21ae 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@xxxxxxxxxxx && > P4EDITOR=cat P4USER=alice P4PASSWD=secret && > export P4EDITOR P4USER P4PASSWD && > - git p4 commit |\ > - grep "git author derek@xxxxxxxxxxx does not match" && > + git p4 commit >actual && > + grep "git author derek@xxxxxxxxxxx does not match" actual && > > make_change_by_user usernamefile3 Charlie charlie@xxxxxxxxxxx && > - git p4 commit |\ > - grep "git author charlie@xxxxxxxxxxx does not match" && > + git p4 commit >actual && > + grep "git author charlie@xxxxxxxxxxx does not match" actual && > > make_change_by_user usernamefile3 alice alice@xxxxxxxxxxx && > git p4 commit >actual 2>&1 && > -- > 2.11.0 >