Re: [PATCH] Correction to git-p4 "exclude" change

From: Luke Diamand <luke@diamand.org>
Date: Feb 5, 2015, 08:24 UTC
Message-ID: <CAE5ih7-Eo9uNCRQHO8bOGCuE0w8U_S4q+aYTNfttSHLQM6GVpA@mail.gmail.com>
In-Reply-To: <CAE5ih7_TJOQ=ttw03V3J9A=jtwUD-Emy-mSp0kNrYKkqMs30ng@mail.gmail.com>

(Resending as plain text).

I could be wrong about this, but my correction above doesn't seem to be in 'next'. Does that mean (reading your last "what's cooking") that the broken version is going to go out to 'master' soon?

Thanks, Luke

On 5 February 2015 at 08:19, Luke Diamand <luke@diamand.org> wrote:

Show 35 quoted lines

> I could be wrong about this, but my correction above doesn't seem to be in
> 'next'. Does that mean (reading your last "what's cooking") that the broken
> version is going to go out to 'master' soon?
>
> Thanks,
> Luke
>
>
> On 28 January 2015 at 20:49, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Luke Diamand <luke@diamand.org> writes:
>>
>> > My previous change for adding support for "exclude" to git-p4 "sync"
>> > was incorrect, missing out a comma, which stopped git-p4 from working.
>> > This change fixes that.
>> >
>> > I've also noticed that t9814-git-p4-rename.sh has stopped working; I'm
>> > going to follow up with a fix for that once I've worked out what's
>> > wrong with it. There's a small shell syntax problem (missing "esac")
>> > but after fixing that it still fails, so I'm not sure what's happening
>> > yet. It was discussed a while back.
>> >
>> > Luke Diamand (1):
>> >   git-p4: correct "exclude" change
>> >
>> >  git-p4.py | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Thanks.
>>
>> Will keep out of 'master' for now.  It may not be a bad idea to
>> squash this fix (and any futher ones if needed) into a single patch
>> when we rewind 'next' after 2.3 final is tagged.
>>
>