From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)
Date: Wed, 25 Apr 2018 09:21:29 -0700 [thread overview]
Message-ID: <CABPp-BHE0H+Y1FNH2NmYjjMRfPsKjzmfVfT5XQatqyFTi8_2kw@mail.gmail.com> (raw)
In-Reply-To: <xmqqmuxr4r6n.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, Apr 25, 2018 at 1:37 AM, Junio C Hamano <gitster@pobox.com> wrote:
> * en/unpack-trees-split-index-fix (2018-04-24) 1 commit
> - unpack_trees: fix breakage when o->src_index != o->dst_index
>
> The split-index feature had a long-standing and dormant bug in
> certain use of the in-core merge machinery, which has been fixed.
>
> Will merge to 'next'.
This topic...
> * en/rename-directory-detection-reboot (2018-04-25) 36 commits
<snip>
>
> Reboot of an attempt to detect wholesale directory renames and use
> it while merging.
>
> Expecting a reroll.
> cf. <CABPp-BHZ-agTY77iqe9BxLC2ijrcKO+UPk83Bn+0cckA3fJFYg@mail.gmail.com>
...is the fix to the issue mentioned in this email you reference. The
various revisions of the en/unpack-trees-split-index-fix patches were
even posted as a response to the parent of the email you reference
(which I thought made sense since the parent was the report of the
issue; sorry if that confused things).
Would you still like a re-roll?
If you do, the _only_ thing I'll change is a minor typo in the commit
message of 948d8a6f0895 ("t6046: testcases checking whether updates
can be skipped in a merge", 2018-04-19), doing a simple s/year/years/.
There aren't any remaining outstanding issues with this series I know
of, and I've tested everything I can think of to test.
next prev parent reply other threads:[~2018-04-25 16:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 8:37 What's cooking in git.git (Apr 2018, #03; Wed, 25) Junio C Hamano
2018-04-25 10:35 ` Ævar Arnfjörð Bjarmason
2018-04-25 17:43 ` Brandon Williams
2018-04-26 12:44 ` Derrick Stolee
2018-04-27 7:02 ` Johannes Schindelin
2018-04-25 12:37 ` js/rebase-recreate-merge, was " Johannes Schindelin
2018-04-25 16:21 ` Elijah Newren [this message]
2018-04-26 4:39 ` Junio C Hamano
2018-04-26 1:13 ` brian m. carlson
2018-04-26 15:26 ` Duy Nguyen
2018-04-27 7:39 ` Eric Sunshine
2018-04-30 0:03 ` Junio C Hamano
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=CABPp-BHE0H+Y1FNH2NmYjjMRfPsKjzmfVfT5XQatqyFTi8_2kw@mail.gmail.com \
--to=newren@gmail.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.
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).