From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: en/merge-dual-dir-renames-fix (Was: Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))
Date: Mon, 4 Jul 2022 18:31:42 -0700 [thread overview]
Message-ID: <CABPp-BGTYCsa8LNPUNKpfbRqZKba-fx=R22ryNn3HB8XDoarXQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqo7y85t44.fsf@gitster.g>
On Fri, Jul 1, 2022 at 4:23 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/merge-dual-dir-renames-fix (2022-06-30) 5 commits
> - merge-ort: fix issue with dual rename and add/add conflict
> - merge-ort: shuffle the computation and cleanup of potential collisions
> - merge-ort: make a separate function for freeing struct collisions
> - merge-ort: small cleanups of check_for_directory_rename
> - t6423: add tests of dual directory rename plus add/add conflict
>
> Fixes a long-standing corner case bug around directory renames in
> the merge-ort strategy.
>
> Will merge to 'next'?
> source: <pull.1268.v3.git.1656653000.gitgitgadget@gmail.com>
Ævar pointed out a for-initializer that shouldn't yet be used since
we've only used that in a "weather balloon" so far. Let me send in a
re-roll to fix that one issue before you merge down.
next prev parent reply other threads:[~2022-07-05 1:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 23:08 What's cooking in git.git (Jul 2022, #01; Fri, 1) Junio C Hamano
2022-07-04 8:12 ` gc/submodule-use-super-prefix & ab/submodule-cleanup (was: What's cooking in git.git (Jul 2022, #01; Fri, 1)) Ævar Arnfjörð Bjarmason
2022-07-06 16:57 ` Glen Choo
2022-07-04 13:15 ` ds/rebase-update-re (was " Derrick Stolee
2022-07-04 15:59 ` Junio C Hamano
2022-07-04 16:58 ` Elijah Newren
2022-07-04 20:17 ` Derrick Stolee
2022-07-05 1:31 ` Elijah Newren [this message]
2022-07-06 17:56 ` gc/bare-repo-discovery " Glen Choo
2022-07-06 22:15 ` 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-BGTYCsa8LNPUNKpfbRqZKba-fx=R22ryNn3HB8XDoarXQ@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).