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

Re: What's cooking in git.git (May 2020, #05; Thu, 14)

From
Elijah Newren <newren@gmail.com>
Date
May 15, 2020, 15:25 UTC
Message-ID
<CABPp-BF2Nh8LntDfw7-zSry00QKWg68qKOFW9QHvtqrSvU=Utw@mail.gmail.com>
In-Reply-To
<xmqqpnb6nk7x.fsf@gitster.c.googlers.com>
On Thu, May 14, 2020 at 6:33 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> * en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
>  - merge-recursive: fix rename/rename(1to2) for working tree with a binary
>
>  When a binary file gets renamed and then merged with a minor
>  change, the copy on the working tree while conflict resolution
>  sometimes got "their" version and not "ours".

This summary feels misleading; it's not simple rename + content merge, it's double rename + content merge. Perhaps:

When a binary file gets modified and renamed on both sides of history to different locations, both files would be written to the working tree but both would have the contents from "ours". This has been corrected so that the path from each side gets their original content.

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 7 in “What's cooking in git.git (May 2020, #05; Thu, 14)”
  1. Junio C HamanoMay 14, 2020
  2. Derrick StoleeMay 15, 2020
  3. Junio C HamanoMay 15, 2020
  4. Elijah NewrenMay 15, 2020
  5. Junio C HamanoMay 15, 2020
  6. Taylor BlauMay 18, 2020
  7. Jacob KellerMay 19, 2020

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.