git/list[1] front-page[2] threads[3] people[4] search[5] about
 

en/merge-dual-dir-renames-fix (Was: Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))

From
Elijah Newren <newren@gmail.com>
Date
Jul 5, 2022, 01:31 UTC
Message-ID
<CABPp-BGTYCsa8LNPUNKpfbRqZKba-fx=R22ryNn3HB8XDoarXQ@mail.gmail.com>
In-Reply-To
<xmqqo7y85t44.fsf@gitster.g>
On Fri, Jul 1, 2022 at 4:23 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
> * 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.

Previous: Derrick StoleeNext: Glen Choo
Message 8 of 10 in “What's cooking in git.git (Jul 2022, #01; Fri, 1)”
  1. Junio C HamanoJul 1, 2022
  2. gc/submodule-use-super-prefix & ab/submodule-cleanup (was: What's cooking in git.git (Jul 2022, #01; Fri, 1))Ævar Arnfjörð Bjarmason, Jul 4, 2022
  3. Glen ChooJul 6, 2022
  4. ds/rebase-update-re (was Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))Derrick Stolee, Jul 4, 2022
  5. Junio C HamanoJul 4, 2022
  6. Elijah NewrenJul 4, 2022
  7. Derrick StoleeJul 4, 2022
  8. en/merge-dual-dir-renames-fix (Was: Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))Elijah Newren, Jul 5, 2022
  9. gc/bare-repo-discovery (was Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))Glen Choo, Jul 6, 2022
  10. Junio C HamanoJul 6, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.