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

Re: Line ending normalization doesn't work as expected

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 5, 2017, 01:38 UTC
Message-ID
<xmqq7ewa9xw6.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20171004211734.GA25379@tor.lan>
Torsten Bögershausen <tboegi@web.de> writes:
> One solution, which you can tell your team, is this one:
> $ git rm -r --cached . && git add .

Both this and its "git read-tree --empty" cousin share a grave issue. The "git add ." step would mean that before doing these commands, your working tree must be truly clean, i.e. the paths in the filesystem known to the index must match what is in the index (modulo the line-ending gotcha you are trying to correct), *AND* there must be *NO* untracked paths you do not want to add in the working tree.

That is a reason why we should solve it differently. Perhaps adding a new option "git add --rehash" to tell Git "Hey, you may think some paths in the index and in the working tree are identical and no need to re-register, but you are WRONG. For each path in the index, remove it and then register the object by hashing the contents from the filesystem afresh!" would be the best way to go. That will not pick up untracked paths left in the filesystem, and does not limit our solution to the "eol normalization is screwey" issue by not calling the option "renormalize" or any other words that imply "why" we are hashing again anew.

Previous: Torsten BögershausenNext: Junio C Hamano
Message 12 of 34 in “Line ending normalization doesn't work as expected”
  1. Robert DaileyOct 3, 2017
  2. Torsten BögershausenOct 3, 2017
  3. Robert DaileyOct 3, 2017
  4. Torsten BögershausenOct 3, 2017
  5. Junio C HamanoOct 4, 2017
  6. Robert DaileyOct 4, 2017
  7. Jonathan NiederOct 4, 2017
  8. Robert DaileyOct 4, 2017
  9. Junio C HamanoOct 5, 2017
  10. Jonathan NiederOct 5, 2017
  11. Torsten BögershausenOct 4, 2017
  12. Junio C HamanoOct 5, 2017
  13. Junio C HamanoOct 5, 2017
  14. Torsten BögershausenOct 5, 2017
  15. Junio C HamanoOct 6, 2017
  16. Torsten BögershausenOct 6, 2017
  17. 1/1 Introduce git add --renormalize .tboegi@web.de, Oct 16, 2017
  18. Junio C HamanoOct 16, 2017
  19. 1/1 Introduce git add --renormalize .tboegi@web.de, Oct 30, 2017
  20. Junio C HamanoNov 7, 2017
  21. Torsten BögershausenNov 7, 2017
  22. Junio C HamanoNov 8, 2017
  23. Torsten BögershausenNov 9, 2017
  24. Junio C HamanoNov 10, 2017
  25. Torsten BögershausenNov 12, 2017
  26. 1/1 Introduce git add --renormalize .tboegi@web.de, Nov 16, 2017
  27. Junio C HamanoNov 17, 2017
  28. Eric SunshineNov 17, 2017
  29. Junio C HamanoNov 18, 2017
  30. Robert DaileyFeb 15, 2018
  31. Junio C HamanoFeb 15, 2018
  32. Robert DaileyFeb 15, 2018
  33. Torsten BögershausenFeb 16, 2018
  34. Robert DaileyFeb 16, 2018

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.