From: Junio C Hamano <email@example.com> To: "brian m. carlson" <firstname.lastname@example.org> Cc: email@example.com, "Torsten Bögershausen" <firstname.lastname@example.org> Subject: Re: [PATCH v2 0/2] Improvements to tests and docs for .gitattributes eol Date: Mon, 14 Feb 2022 10:15:43 -0800 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> (brian m. carlson's message of "Mon, 14 Feb 2022 02:08:25 +0000") "brian m. carlson" <email@example.com> writes: > I was answering a question on StackOverflow recently about the > interaction between text=auto and eol, and someone pointed out to me > that what I had written, which was based on the documentation, was not > correct as of Git 2.10 (and more specifically 6523728499 ("convert: > unify the "auto" handling of CRLF", 2016-06-28)). > > When I set out to document the behavior correctly, I ran into the fact > that the tests, where I looked for examples of how this behaves, didn't > have any tests for some of these cases, and so I had some trouble > documenting this clearly and accurately. So this series basically just > adds some tests for existing behavior so we don't change it (and so I > could figure out how it works) and then updates the documentation > accordingly. This seems to be a replacement of the two-patch series that was merged to 'master' at 8db2f665 (Merge branch 'bc/clarify-eol-attr', 2022-02-11) and was merged to 'next' at dc1db4bd (Merge branch 'bc/clarify-eol-attr' into next, 2022-02-04). The changes seem to be in the second step to update Documentation/gitattributes.txt and it needs to be made an incremental update. Thanks. ---- >8 ----- From: brian m. carlson <firstname.lastname@example.org> Subject: doc: clarify interaction between 'eol' and text=auto The `eol` takes effect on text files only when the index has the contents in LF line endings. Paths with contents in CRLF line endings in the index may become dirty unless text=auto. Signed-off-by: brian m. carlson <email@example.com> Signed-off-by: Junio C Hamano <firstname.lastname@example.org> --- Documentation/gitattributes.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git c/Documentation/gitattributes.txt w/Documentation/gitattributes.txt index 60984a4682..a71dad2674 100644 --- c/Documentation/gitattributes.txt +++ w/Documentation/gitattributes.txt @@ -161,11 +161,12 @@ unspecified. This attribute sets a specific line-ending style to be used in the working directory. This attribute has effect only if the `text` -attribute is set or unspecified, or if it is set to `auto` and the file -is detected as text. Note that setting this attribute on paths which -are in the index with CRLF line endings may make the paths to be -considered dirty. Adding the path to the index again will normalize the -line endings in the index. +attribute is set or unspecified, or if it is set to `auto`, the file is +detected as text, and it is stored with LF endings in the index. Note +that setting this attribute on paths which are in the index with CRLF +line endings may make the paths to be considered dirty unless +`text=auto` is set. Adding the path to the index again will normalize +the line endings in the index. Set to string value "crlf"::
next prev parent reply other threads:[~2022-02-14 18:16 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-11 2:15 [PATCH " brian m. carlson 2022-01-11 2:15 ` [PATCH 1/2] t0027: add tests for eol without text in .gitattributes brian m. carlson 2022-01-11 2:15 ` [PATCH 2/2] docs: correct documentation about eol attribute brian m. carlson 2022-01-11 18:30 ` Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= 2022-01-11 22:40 ` brian m. carlson 2022-01-12 15:16 ` Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= 2022-02-14 2:08 ` [PATCH v2 0/2] Improvements to tests and docs for .gitattributes eol brian m. carlson 2022-02-14 2:08 ` [PATCH v2 1/2] t0027: add tests for eol without text in .gitattributes brian m. carlson 2022-02-14 2:08 ` [PATCH v2 2/2] docs: correct documentation about eol attribute brian m. carlson 2022-02-14 14:52 ` [PATCH v2 0/2] Improvements to tests and docs for .gitattributes eol Derrick Stolee 2022-02-14 18:15 ` Junio C Hamano [this message] 2022-02-14 20:46 ` Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= 2022-02-15 0:15 ` Junio C Hamano 2022-02-15 7:05 ` Johannes Sixt 2022-02-15 22:46 ` brian m. carlson 2022-02-16 7:00 ` Johannes Sixt 2022-02-16 10:28 ` brian m. carlson 2022-02-16 11:52 ` Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= 2022-02-16 19:02 ` Johannes Sixt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH v2 0/2] Improvements to tests and docs for .gitattributes eol' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).