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

Re: Failed expectations or bug?

From
Matthias Kestenholz <mk@spinlock.ch>
Date
Sep 4, 2008, 10:18 UTC
Message-ID
<1f6632e50809040318n2974cdf2t3664c759978dc8d3@mail.gmail.com>
In-Reply-To
<EA0C3F3E-0DA8-49A7-8151-5A2EC6C7BEEA@simplicidade.org>
On Thu, Sep 4, 2008 at 11:49 AM, Pedro Melo <melo@simplicidade.org> wrote:
Show 18 quoted lines
> Hi,
>
> I was learning about git rename detection and came across a unexpected
> result. See the following sequence:
>
> [...]
>
> Maybe I have the wrong expectations, but after the merge I was expecting
> either:
>
>  * b and c have the same content, with the modified D;
>  * b has the modifications made in master, and c has the original content.
>
> I did not expect the patch to 'a' in master to propagate across the copy to
> c.
>
> What am I doing wrong here?
>
The rename detection needs more than a single character to work reliably.

If you do roughly the same test but with bigger files you should get better the results.

Matthias
Previous: Pedro Melo
Message 2 of 2 in “Failed expectations or bug?”
  1. Pedro MeloSep 4, 2008
  2. Matthias KestenholzSep 4, 2008

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.