[PATCH 0/1] Fix make -C t chainlint with DOS line endings

STALE2910d

3 messages, 2 authors, 2018-08-15 · open the first message on its own page

[PATCH 0/1] Fix make -C t chainlint with DOS line endings

From: Johannes Schindelin via GitGitGadget <hidden>
Date: 2018-08-15 14:33:46

Historically, nobody paid attention to our own source code having correct
Git attributes
[https://www.edwardthomson.com/blog/git_for_windows_line_endings.html] when
it comes to line endings. Because historically, we had no good way to
specify that ;-)

But now we do, and so we need to use it. Especially when it would break the
build otherwise.

Johannes Schindelin (1):
  chainlint: fix for core.autocrlf=true

 t/.gitattributes | 1 +
 1 file changed, 1 insertion(+)


base-commit: 1d89318c48d233d52f1db230cf622935ac3c69fa
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-19%2Fdscho%2Ffix-chainlint-on-windows-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-19/dscho/fix-chainlint-on-windows-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/19
-- 
gitgitgadget

[PATCH 1/1] chainlint: fix for core.autocrlf=true

From: Johannes Schindelin via GitGitGadget <hidden>
Date: 2018-08-15 14:33:47

From: Johannes Schindelin <redacted>

The `chainlint` target compares actual output to expected output, where
the actual output is generated from files that are specifically checked
out with LF-only line endings. So the expected output needs to be
checked out with LF-only line endings, too.

Signed-off-by: Johannes Schindelin <redacted>
---
 t/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
diff --git a/t/.gitattributes b/t/.gitattributes
index 3bd959ae5..9d09df5a6 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,4 +1,5 @@
 t[0-9][0-9][0-9][0-9]/* -whitespace
+/chainlint/*.expect eol=lf
 /diff-lib/* eol=lf
 /t0110/url-* binary
 /t3900/*.txt eol=lf
-- 
gitgitgadget

Re: [PATCH 1/1] chainlint: fix for core.autocrlf=true

From: Eric Sunshine <hidden>
Date: 2018-08-15 16:32:29

On Wed, Aug 15, 2018 at 10:33 AM Johannes Schindelin via GitGitGadget
[off-list ref] wrote:
quoted hunk
The `chainlint` target compares actual output to expected output, where
the actual output is generated from files that are specifically checked
out with LF-only line endings. So the expected output needs to be
checked out with LF-only line endings, too.

Signed-off-by: Johannes Schindelin <redacted>
---
diff --git a/t/.gitattributes b/t/.gitattributes
@@ -1,4 +1,5 @@
+/chainlint/*.expect eol=lf
Make sense. I did touch t/.gitignore for the chainlint series but
never thought to examine t/.gitattributes (and wasn't necessarily
aware of its existence). Had I looked inside .gitattributes, perhaps I
would have intuited the need for this change. Thanks for handling it.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help