Re: [PATCH] notes: allow merging from arbitrary references

From: Jacob Keller <jacob.keller@gmail.com>
Date: Nov 26, 2015, 06:20 UTC
Message-ID: <CA+P7+xpp4mF5iuZ+i_8vuB4BoHBvpmS=jq-xAeae7bdT9UGHhA@mail.gmail.com>
In-Reply-To: <20151124234206.GA31949@sigill.intra.peff.net>

On Tue, Nov 24, 2015 at 3:42 PM, Jeff King <peff@peff.net> wrote:

Show 22 quoted lines

> On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote:
>
>> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote:
>>
>> > ---
>> > I do not remember what version this was since it has been an age ago
>> > that I sent the previous code. This is mostly just a rebase onto current
>> > next. I believe I have covered everything previous reviewers noted.
>>
>> Please keep topics branched from master where possible. And if not
>> possible, please indicate which topic in 'next' is required to build on.
>>
>> We never merge 'next' itself, only individual topics from it. So I can't
>> just apply your patch on top of 'next'.
>>
>> I did get it to apply on the current master with "am -3", but some tests
>> in t3310 seem to fail. Can you take a look?
>
> I just noticed v2, which I missed earlier. But the same complaints
> apply. :)
>
> -Peff

Yea.. sorry about that. I normally work off next since this is what I use day to day for general git use, as I like to run the bleedy edge.

I can respin these on master, but it may take a bit of time as I am on vacation at the moment.

I'm also curious if people would rather go the more difficult route first or not.

Regards, Jake