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

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 28, 2015, 07:28 UTC
Message-ID
<xmqqbni8vhiz.fsf@gitster.dls.corp.google.com>
In-Reply-To
<553E90C0.4070103@web.de>
Torsten Bögershausen <tboegi@web.de> writes:
Show 18 quoted lines
> What do you think about the following test cases for a V2 patch ?
>
> test_expect_success 'create blamerepo' '
>     test_create_repo blamerepo &&
>     (
>         cd blamerepo &&
>         printf "testcase\r\n" >crlffile &&
>         git -c core.autocrlf=false add crlffile &&
>         git commit -m "add files" &&
>         git -c core.autocrlf=false blame crlffile >crlfclean.txt
>     )
> '
>
> test_expect_success 'blaming files with CRLF newlines in repo, core.autoclrf=input' '
>     (
>         cd blamerepo &&
>         git -c core.autocrlf=input blame crlffile >actual &&
>         grep "Not Committed Yet" actual

Are you interested in seeing just some of the lines to show up as "Not commited yet", or all of them? I think it would be the latter, so perhaps

    ! grep -v "Not Committed Yet" actual
or something?
>     )
> '
>
>
Two blank lines only here?
Show 7 quoted lines
> test_expect_success 'blaming files with CRLF newlines core.autocrlf=true' '
>     (
>         cd blamerepo &&
>         git -c core.autocrlf=true blame crlffile >actual &&
>         test_cmp crlfclean.txt actual
>     )
> '
OK
Show 7 quoted lines
> test_expect_success 'blaming files with CRLF newlines core.autocrlf=false' '
>     (
>         cd blamerepo &&
>         git -c core.autocrlf=false blame crlffile >actual &&
>         test_cmp crlfclean.txt actual
>     )
> '

Hmm, how's this blame invocation any different from the one done in the set-up step at the very beginning? In other words, I am not sure what kind of breakage could cause this step to fail.

I see there is no "git blame HEAD crlffile" that bypasses the fake latest commit altogether. Wouldn't that be the most appropriate thing to compare against (i.e. how to create crlfclean.txt in the set-up step)?

Previous: Torsten BögershausenNext: Torsten Bögershausen
Message 14 of 16 in “blame: CRLF in the working tree and LF in the repo”
  1. blame: CRLF in the working tree and LF in the repoTorsten Bögershausen, Apr 26, 2015
  2. Eric SunshineApr 26, 2015
  3. Stepan KasalApr 27, 2015
  4. Junio C HamanoApr 27, 2015
  5. Stepan KasalApr 27, 2015
  6. Johannes SixtApr 27, 2015
  7. Torsten BögershausenApr 27, 2015
  8. Johannes SixtApr 28, 2015
  9. Junio C HamanoApr 28, 2015
  10. Johannes SixtApr 28, 2015
  11. Stepan KasalApr 28, 2015
  12. Junio C HamanoApr 27, 2015
  13. Torsten BögershausenApr 27, 2015
  14. Junio C HamanoApr 28, 2015
  15. Torsten BögershausenApr 28, 2015
  16. brian m. carlsonApr 28, 2015

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.