All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
	"git@vger.kernel.org" <git@vger.kernel.org>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Loic Dachary <loic@dachary.org>
Subject: Re: [PATCHv1 0/6] Fix bug in large transactions
Date: Thu, 22 Jan 2015 09:52:10 -0800	[thread overview]
Message-ID: <CAGZ79kZ5fdDiT=zXhQkt17kxLBbkJnh1F06nyZJN7ta9WZ2dmQ@mail.gmail.com> (raw)
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:
> 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.

  reply	other threads:[~2015-01-22 17:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-21 23:23 [PATCHv1 0/6] Fix bug in large transactions Stefan Beller
2015-01-21 23:23 ` [PATCH 1/6] update-ref: Test handling large transactions properly Stefan Beller
2015-01-21 23:34   ` Jeff King
2015-01-21 23:23 ` [PATCH 2/6] refs.c: remove lock_fd from struct ref_lock Stefan Beller
2015-01-21 23:23 ` [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full Stefan Beller
2015-01-21 23:38   ` Jeff King
2015-01-21 23:44     ` Stefan Beller
2015-01-21 23:52       ` Jeff King
2015-01-21 23:23 ` [PATCH 4/6] refs.c: Have a write_in_full_to_lock_file wrapping write_in_full Stefan Beller
2015-01-21 23:40   ` Jeff King
2015-01-21 23:23 ` [PATCH 5/6] refs.c: write to a lock file only once Stefan Beller
2015-01-21 23:44   ` Jeff King
2015-01-21 23:23 ` [PATCH 6/6] refs.c: enable large transactions Stefan Beller
2015-01-21 23:47 ` [PATCHv1 0/6] Fix bug in " Jeff King
2015-01-22  8:00   ` Junio C Hamano
2015-01-22 17:52     ` Stefan Beller [this message]
2015-01-22 17:58       ` Junio C Hamano
2015-01-22 18:29         ` Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAGZ79kZ5fdDiT=zXhQkt17kxLBbkJnh1F06nyZJN7ta9WZ2dmQ@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=loic@dachary.org \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.