Elijah Newren wrote: > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> For the confused: this patch takes advantage of patch 1 to clarify the t4017 (diff exit code) tests. No functional change should be involved, except better error messages when tests fail with -v. > --- a/t/t4017-diff-retval.sh > +++ b/t/t4017-diff-retval.sh [...] > @@ -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 &&? With that exception, Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html