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

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

From
Torsten Bögershausen <tboegi@web.de>
Date
Aug 24, 2017, 05:50 UTC
Message-ID
<20170824055054.GA32617@tor.lan>
In-Reply-To
<20170823211741.9633-1-mathstuf@gmail.com>
On Wed, Aug 23, 2017 at 05:17:41PM -0400, Ben Boeckel wrote:
Show 24 quoted lines
> When setting the `eol` attribute, paths can change their dirty status
> without any change in the working directory. This can cause confusion
> and should at least be mentioned with a remedy.
> 
> Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
> ---
>  Documentation/gitattributes.txt | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index c4f2be2..3044b71 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -151,7 +151,11 @@ unspecified.
>  
>  This attribute sets a specific line-ending style to be used in the
>  working directory.  It enables end-of-line conversion without any
> -content checks, effectively setting the `text` attribute.
> +content checks, effectively setting the `text` attribute.  Note that
> +setting this attribute on paths which are in the index with different
> +line endings than the attribute indicates the paths to be considered
> +dirty.  Adding the path to the index again will normalize the line
> +endings in the index.
>

There is one minor comment: The problem is when files had been commited with CRLF (regardless what your eol= attribute says)

How about something like this :
  This attribute sets a specific line-ending style to be used in the
  working directory.  It enables end-of-line conversion without any
 -content checks, effectively setting the `text` attribute.
 +content checks, effectively setting the `text` attribute.  Note that
 +setting this attribute on paths which are in the index with CRLF
 +line endings makes the paths to be considered dirty.
 +Adding the path to the index again will normalize the line
 +endings in the index.
Previous: Ben BoeckelNext: Ben Boeckel
Message 9 of 15 in “Cannot checkout after setting the eol attribute”
  1. Ben BoeckelAug 22, 2017
  2. Torsten BögershausenAug 22, 2017
  3. Ben BoeckelAug 22, 2017
  4. Torsten BögershausenAug 23, 2017
  5. Ben BoeckelAug 23, 2017
  6. Junio C HamanoAug 22, 2017
  7. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 23, 2017
  8. Ben BoeckelAug 23, 2017
  9. Torsten BögershausenAug 24, 2017
  10. Ben BoeckelAug 30, 2017
  11. Junio C HamanoAug 30, 2017
  12. Ben BoeckelAug 31, 2017
  13. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 30, 2017
  14. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 31, 2017
  15. Torsten BögershausenAug 31, 2017

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.