Re: [PATCH 02/12] t4150: am fails if index is dirty

2015-07-06 Thread Paul Tan
On Sun, Jul 5, 2015 at 11:38 PM, Johannes Schindelin wrote: > On 2015-07-02 20:16, Paul Tan wrote: > >> diff --git a/t/t4150-am.sh b/t/t4150-am.sh >> index 3f54bdf..0a19136 100755 >> --- a/t/t4150-am.sh >> +++ b/t/t4150-am.sh >> @@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly'

Re: [PATCH 02/12] t4150: am fails if index is dirty

2015-07-05 Thread Johannes Schindelin
Hi Paul, On 2015-07-02 20:16, Paul Tan wrote: > diff --git a/t/t4150-am.sh b/t/t4150-am.sh > index 3f54bdf..0a19136 100755 > --- a/t/t4150-am.sh > +++ b/t/t4150-am.sh > @@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly' ' > test "$(git rev-parse second^)" = "$(git rev-par

[PATCH 02/12] t4150: am fails if index is dirty

2015-07-02 Thread Paul Tan
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am will ensure that the index is clean before applying the patch. This is to prevent changes unrelated to the patch from being committed. Add a test for this check. Cc: Junio C Hamano Signed-off-by: Paul Tan --- t/t4150-am.sh