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

Re: [PATCH 4/4] diffcore-delta.c: Ignore CR in CRLF for text files

From
しらいしななこ <nanako3@bluebottle.com>
Date
Jun 29, 2007, 08:14 UTC
Message-ID
<200706290813.l5T8DJ6w024507@mi1.bluebottle.com>
In-Reply-To
<1183098962312-git-send-email-gitster@pobox.com>
Quoting Junio C Hamano <gitster@pobox.com>:
Show 11 quoted lines
> This ignores CR byte in CRLF sequence in text file when
> computing similarity of two blobs.
> ...
> +test_expect_success 'diff -M' '
> +
> +	git diff-tree -M -r --name-status HEAD^ HEAD |
> +	sed -e "s/R[0-9]*/RNUM/" >actual &&
> +	echo "RNUM	sample	elpmas" >expect &&
> +	diff -u expect actual
> +
> +'

I tried this test but it does not give R100. The new file is unchanged except for LF -> CRLF. Could you explain why?

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Get a free email address with REAL anti-spam protection.
http://www.bluebottle.com
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 9 in “Applying patches in a directory that isn't a repository”
  1. Geoff RussellJun 29, 2007
  2. Junio C HamanoJun 29, 2007
  3. 1/4 diffcore_count_changes: pass diffcore_filespecJunio C Hamano, Jun 29, 2007
  4. 2/4 diffcore_filespec: add is_binaryJunio C Hamano, Jun 29, 2007
  5. 3/4 diffcore-delta.c: update the comment on the algorithm.Junio C Hamano, Jun 29, 2007
  6. 4/4 diffcore-delta.c: Ignore CR in CRLF for text filesJunio C Hamano, Jun 29, 2007
  7. しらいしななこJun 29, 2007
  8. Junio C HamanoJun 29, 2007
  9. Geoff RussellJun 30, 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.