From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)
Date: Wed, 14 Feb 2018 12:16:39 -0800 [thread overview]
Message-ID: <xmqqlgfvmimw.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BEdAgpLMYW=i6ABzWHuqQvJcXDJ-6u-VuFAtU8sxiLvHA@mail.gmail.com> (Elijah Newren's message of "Wed, 14 Feb 2018 11:07:03 -0800")
Elijah Newren <newren@gmail.com> writes:
>> Rename detection logic in "diff" family that is used in "merge" has
>> learned to guess when all of x/a, x/b and x/c have moved to z/a,
>> z/b and z/c, it is likely that x/d added in the meantime would also
>> want to move to z/d by taking the hint that the entire directory
>> 'x' moved to 'z'.
>
> When you write release notes for this series, you may want to consider
> also calling out one or more of the bugs that were fixed as a side
> effect:
> * a bug causing dirty files involved in a rename to be overwritten
> during merge
> * a few memory leaks
> I added a reminder about these two fixes in the cover letter for my
> latest (and possibly last?) roll of the series that I just sent out.
Thanks.
prev parent reply other threads:[~2018-02-14 20:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 1:51 What's cooking in git.git (Feb 2018, #02; Tue, 13) Junio C Hamano
2018-02-14 9:36 ` Duy Nguyen
2018-02-14 17:12 ` Junio C Hamano
2018-02-14 14:10 ` Derrick Stolee
2018-02-14 17:23 ` Junio C Hamano
2018-02-14 17:47 ` Derrick Stolee
2018-02-14 18:11 ` Brandon Williams
2018-02-14 18:21 ` Stefan Beller
2018-02-14 19:07 ` Elijah Newren
2018-02-14 20:16 ` Junio C Hamano [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlgfvmimw.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).