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

Re: BUG: git can't handle certain kinds of renames in merges

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Mar 10, 2009, 19:51 UTC
Message-ID
<81bfc67a0903101251r29e14154ud289646a1f5c20e0@mail.gmail.com>
In-Reply-To
<252A6411-2658-4DC6-A7F4-29CA3981F8FB@frim.nl>
On Tue, Mar 10, 2009 at 12:02 PM, Pieter de Bie <pieter@frim.nl> wrote:
> ind of toy examples. Git can't infer the file
> was renamed because almost nothing is similar enough. Take
> a look at the attached script and run it with 'sh test.sh'
> and 'sh test.sh real_test', and look at the difference.

I've got a much bigger example(hundreds of lines, and dozens change at a time) which resolves in the same problem or worse with git-tree-write errors. I'm trying to figure out now how to work around this issue.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Previous: Pieter de Bie
Message 3 of 3 in “BUG: git can't handle certain kinds of renames in merges”
  1. Caleb CushingMar 10, 2009
  2. Pieter de BieMar 10, 2009
  3. Caleb CushingMar 10, 2009

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.