Re: [PATCHv5 03/16] t4017 (diff-retval): replace manual exit code check with test_expect_code
- From
Elijah Newren <newren@gmail.com>
- Date
- Oct 3, 2010, 19:33 UTC
- Message-ID
- <AANLkTik1D3m-n1LZqq0cs1j7TdTVsi9LfiwcrWSHinPJ@mail.gmail.com>
- In-Reply-To
- <20101003134757.GA17084@burratino>
On Sun, Oct 3, 2010 at 7:47 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 13 quoted lines
>> @@ -145,20 +122,14 @@ test_expect_success 'check honors conflict marker length' ' >> git reset --hard && >> echo ">>>>>>> boo" >>b && >> echo "======" >>a && >> - git diff --check a && >> - ( >> - git diff --check b >> - test $? = 2 >> - ) && >> + git diff --check a >> + test_expect_code 2 git diff --check b && > > Missing &&?
Indeed -- that's pretty embarrassing, considering the topic of the series. :-/ Good catch.
> With that exception, > Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.