Re: [PATCHv1 0/6] Fix bug in large transactions
- From
Stefan Beller <sbeller@google.com>
- Date
- Jan 22, 2015, 17:52 UTC
- Message-ID
- <CAGZ79kZ5fdDiT=zXhQkt17kxLBbkJnh1F06nyZJN7ta9WZ2dmQ@mail.gmail.com>
- In-Reply-To
- <xmqqsif3tfcf.fsf@gitster.dls.corp.google.com>
On Thu, Jan 22, 2015 at 12:00 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 41 quoted lines
> Jeff King <peff@peff.net> writes:
>
>> On Wed, Jan 21, 2015 at 03:23:39PM -0800, Stefan Beller wrote:
>>
>>> (reported as: git update-ref --stdin : too many open files, 2014-12-20)
>>>
>>> First a test case is introduced to demonstrate the failure,
>>> the patches 2-6 are little refactoring and the last patch
>>> fixes the bug and also marks the bugs as resolved in the
>>> test suite.
>>>
>>> Unfortunately this applies on top of origin/next.
>>
>> Saying "applies on next" is not very useful to Junio. He is not going to
>> branch a topic straight from "next", as merging it to master would pull
>> in all of the topics cooking in "next" (not to mention a bunch of merge
>> commits which are generally never part of "master").
>>
>> Instead, figure out which topic in next you actually _need_ to build on,
>> and then it can be branched from there. And if there is no such topic,
>> then you should not be building on next, of course. :) But I think you
>> know that part already.
>
> All very true.
>
> I consider anything new that appears late in the cycle, especially
> during deep in the pre-release freeze, less for me to apply but more
> for others to eyeball the preview of a series the submitter plans to
> work on once the next cycle starts, so basing on 'next' does not
> hurt too much. For interested others,
>
> git checkout origin/next^0
>
> would be shorter to type than
>
> git checkout "origin/next^{/^Merge branch 'sb/atomic-push'}^2"
>
> so... ;-)
>
> But what is more troublesome is that neither this or updated v2
> applies to 'next'.v2 applies to sb/atomic-push instead of next and will result in a one line merge conflict with next.
I know we're late in the cycle, hence I was just sending out for reviews. Though as it's not a feature, but a bug fix it may be worth picking it up now if it's easy to apply.
Thanks, Stefan
> > Let me try to wiggle it in first. > > Thanks.