From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Dec 2013, #05; Thu, 26)
Date: Thu, 2 Jan 2014 16:37:15 -0500 [thread overview]
Message-ID: <CAPig+cSdaD5krMDPGOWXJVoGFQZKY1Oee232mAj7PHTyoy=HRw@mail.gmail.com> (raw)
In-Reply-To: <xmqqd2kaozqz.fsf@gitster.dls.corp.google.com>
On Thu, Jan 2, 2014 at 4:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
>
>> On Fri, Dec 27, 2013 at 5:13 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Eric Sunshine <sunshine@sunshineco.com> writes:
>>>
>>>> On Thu, Dec 26, 2013 at 4:08 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>>>> [New Topics]
>>>>
>>>> Would $gmane/239575 [1] be of interest for "New Topics"?
>>>>
>>>> [1]: http://article.gmane.org/gmane.comp.version-control.git/239575/
>>>
>>> Actually I was planning to scoop it up directly to master but forgot
>>> to do so.
>>
>> Make sense.
>>
>>> Running "git diff maint pu -- name-hash.c" shows that we have added
>>> a comment that mentions index_name_exists---that needs to be
>>> adjusted, too, by the way.
>>
>> Oops, yes, I had noticed that too when testing atop 'pu' but then
>> forgot about it when preparing the patch for submission on 'master'.
>>
>> I'm not sure how to move forward with this now that kb/fast-hashmap,
>> with which it has a textual conflict, has graduated to 'next'. Should
>> this become a two-patch series with one for scooping directly to
>> 'master' and one for 'next' to sit atop kb/fast-hashmap? (But how will
>> the textual conflict be handled?)
>
> I have a feeling that a small unused helper function is not a huge
> breakage that needs to be immediately fixed, so a single patch as a
> clean-up on top of whatever is cooking on 'next' should be the best
> approach, I would think.
Sounds good. Thanks.
prev parent reply other threads:[~2014-01-02 21:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-26 21:08 What's cooking in git.git (Dec 2013, #05; Thu, 26) Junio C Hamano
2013-12-27 21:54 ` Eric Sunshine
2013-12-27 22:13 ` Junio C Hamano
2014-01-02 20:47 ` Eric Sunshine
2014-01-02 21:11 ` Junio C Hamano
2014-01-02 21:37 ` Eric Sunshine [this message]
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='CAPig+cSdaD5krMDPGOWXJVoGFQZKY1Oee232mAj7PHTyoy=HRw@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).