Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2015-01-07 Thread Junio C Hamano
Doug Kelly writes: > On Mon, Dec 29, 2014 at 9:42 AM, Junio C Hamano wrote: >> Eric Sunshine writes: >> + (git am --abort || true) && >> >> Why (x || y)? Is 'x' so unreliable that we do not know how should exit? >> Should this be "test_must_fail git am --abort"? >> > Updated to test

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2015-01-07 Thread Doug Kelly
On Mon, Dec 29, 2014 at 9:42 AM, Junio C Hamano wrote: > Eric Sunshine writes: > >>> + (git am --abort || true) && > > Why (x || y)? Is 'x' so unreliable that we do not know how should exit? > Should this be "test_must_fail git am --abort"? > Updated to test_might_fail -- we don't know if

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-29 Thread Junio C Hamano
Eric Sunshine writes: >> + (git am --abort || true) && Why (x || y)? Is 'x' so unreliable that we do not know how should exit? Should this be "test_must_fail git am --abort"? >> + (cd submodule && git rev-parse HEAD >../actual) && "git -C submodule rev-parse HEAD >actual" perhaps?

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-27 Thread Doug Kelly
On Sat, Dec 27, 2014 at 6:37 PM, Eric Sunshine wrote: > > On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly wrote: > > git am will break when using diff.submodule=log; add some test cases > > to illustrate this breakage as simply as possible. There are > > currently two ways this can fail: > > > > * W

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-27 Thread Eric Sunshine
On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly wrote: > git am will break when using diff.submodule=log; add some test cases > to illustrate this breakage as simply as possible. There are > currently two ways this can fail: > > * With errors ("unrecognized input"), if only change > * Silently (no su

[PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-26 Thread Doug Kelly
git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently two ways this can fail: * With errors ("unrecognized input"), if only change * Silently (no submodule change), if other files change Test for both condition