Re: [PATCH 0/5] Extend pattern refspecs

From: Jay Soffian <jaysoffian@gmail.com>
Date: Mar 9, 2009, 15:46 UTC
Message-ID: <76718490903090846x2e84816emed5e21da9788680d@mail.gmail.com>
In-Reply-To: <alpine.LNX.1.00.0903080447450.19665@iabervon.org>

On Sun, Mar 8, 2009 at 4:49 AM, Daniel Barkalow <barkalow@iabervon.org> wrote:

Show 22 quoted lines

> On Sun, 8 Mar 2009, Junio C Hamano wrote:
>
>> Jay Soffian <jaysoffian@gmail.com> writes:
>>
>> > This series and js/remote-improvements (e5dcbfd) in pu may not get
>> > along completely. "git remote show" tries to show how the refspecs
>> > expand out.
>>
>> I've created an "early semantic conflict resolution" topic branch that is
>> a cross between this series and js/remote-improvements, like so:
>>
>>     $ git checkout -b xx/db-refspec-vs-js-remote db/refspec-wildcard-in-the-middle
>>     $ git merge js/remote-improvements
>>     $ git apply evil-fixup.diff
>>     $ git commit --amend -a -m "Evil merge."
>>
>> with the following "fixup-as-an-evil-merge patch", which I'd appreciate if
>> you two can sanity check.
>
> That looks like what I'd come up with as a resolution, too, so I think
> it's sane unless Jay knows of another way to get remote to care about
> patterns.

Looks good to me too.

j.