From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 08 Aug 2010 21:43:58 GMT
Subject: Re: [PATCHv2 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Message-ID: <20100808214358.GB6962@burratino>
In-Reply-To: <201008082336.18270.j6t@kdbg.org>

Johannes Sixt wrote:
> On Sonntag, 8. August 2010, Elijah Newren wrote:

>> +test_expect_success 'setup for avoiding reapplying old patches' '
>> +	(cd dst &&
>> +	 (git rebase --abort || true) &&
>
> Perhaps:
>
> 	test_might_fail git rebase --abort &&
>
> but I'm not sure whether that's the intended use of test_might_fail.

It is.  Thanks for noticing.