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

Re: [PATCH] Ignore end-of-line style when computing similarity score for rename detection

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 28, 2007, 08:16 UTC
Message-ID
<7vejjwo5ne.fsf@assigned-by-dhcp.pobox.com>
In-Reply-To
<4683619A.F753C97E@eudaptics.com>
Johannes Sixt <J.Sixt@eudaptics.com> writes:
Show 27 quoted lines
> Steven Grimm wrote:
>> 
>> Signed-off-by: Steven Grimm <koreth@midwinter.com>
>> ---
>> Okay, let's try this again with an MUA that won't change my tabs to
>> spaces -- sorry about that.
>> 
>> A couple of source files got checked into my code base with DOS-style
>> end-of-line characters. I converted them to UNIX-style (the convention
>> for this project) in my branch. Then later, I renamed a couple of them.
>> 
>> Meanwhile, back in the original branch, someone else fixed a bug in one
>> of the files and checked it in, still with DOS-style line endings.
>> 
>> When I merged that change into my branch, git didn't detect the rename
>> because the fact that every line has a change (the end-of-line
>> character) dropped the similarity score way too low.
>> 
>> This patch teaches git to ignore end-of-line style when looking for
>> potential rename candidates. A separate question, which I expect may be
>> more controversial, is what to do with conflict markers; with this
>> patch, the entire file is still marked as in conflict if the end-of-line
>> style changes (but it's still an improvement in that we at least detect
>> the rename now.)
>
> I think that nobody would object to have a use-case description like
> this in the commit message...
Oh, yeah.  100% agreed.
Previous: Johannes SixtNext: Junio C Hamano
Message 4 of 11 in “Ignore end-of-line style when computing similarity score for rename detection”
  1. Ignore end-of-line style when computing similarity score for rename detectionSteven Grimm, Jun 28, 2007
  2. Ignore end-of-line style when computing similarity score for rename detectionSteven Grimm, Jun 28, 2007
  3. Johannes SixtJun 28, 2007
  4. Junio C HamanoJun 28, 2007
  5. Junio C HamanoJun 28, 2007
  6. Ignore end-of-line style when computing similarity score for rename detectionSteven Grimm, Jun 28, 2007
  7. Shawn O. PearceJun 28, 2007
  8. Junio C HamanoJun 29, 2007
  9. Johannes SchindelinJun 28, 2007
  10. Steven GrimmJun 28, 2007
  11. Johannes SchindelinJun 29, 2007

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.