On 8 January 2017 at 16:55, Pranit Bauva <pranit.ba...@gmail.com> 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.
Looks good to me, thanks! Ack. > > Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> > --- > 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 76004a5..bda222a 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 de...@example.com && > P4EDITOR=cat P4USER=alice P4PASSWD=secret && > export P4EDITOR P4USER P4PASSWD && > - git p4 commit |\ > - grep "git author de...@example.com does not match" && > + git p4 commit >actual && > + grep "git author de...@example.com does not match" actual && > > make_change_by_user usernamefile3 Charlie char...@example.com > && > - git p4 commit |\ > - grep "git author char...@example.com does not match" && > + git p4 commit >actual && > + grep "git author char...@example.com does not match" actual && > > make_change_by_user usernamefile3 alice al...@example.com && > git p4 commit >actual && > > -- > https://github.com/git/git/pull/314
