git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] Fix make -C t chainlint with DOS line endings
@ 2018-08-15 14:33 Johannes Schindelin via GitGitGadget
  2018-08-15 14:33 ` [PATCH 1/1] chainlint: fix for core.autocrlf=true Johannes Schindelin via GitGitGadget
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2018-08-15 14:33 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] chainlint: fix for core.autocrlf=true
  2018-08-15 14:33 [PATCH 0/1] Fix make -C t chainlint with DOS line endings Johannes Schindelin via GitGitGadget
@ 2018-08-15 14:33 ` Johannes Schindelin via GitGitGadget
  2018-08-15 16:31   ` Junio C Hamano
  2018-08-15 16:32   ` Eric Sunshine
  0 siblings, 2 replies; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2018-08-15 14:33 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Johannes Schindelin

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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 <johannes.schindelin@gmx.de>
---
 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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] chainlint: fix for core.autocrlf=true
  2018-08-15 14:33 ` [PATCH 1/1] chainlint: fix for core.autocrlf=true Johannes Schindelin via GitGitGadget
@ 2018-08-15 16:31   ` Junio C Hamano
  2018-08-15 16:32   ` Eric Sunshine
  1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2018-08-15 16:31 UTC (permalink / raw)
  To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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 <johannes.schindelin@gmx.de>
> ---
>  t/.gitattributes | 1 +
>  1 file changed, 1 insertion(+)

Good spotting.  A help like this from those on different platforms
than what the original author uses is the ideal model of how we
collaborate together.

Will queue.

>
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] chainlint: fix for core.autocrlf=true
  2018-08-15 14:33 ` [PATCH 1/1] chainlint: fix for core.autocrlf=true Johannes Schindelin via GitGitGadget
  2018-08-15 16:31   ` Junio C Hamano
@ 2018-08-15 16:32   ` Eric Sunshine
  1 sibling, 0 replies; 4+ messages in thread
From: Eric Sunshine @ 2018-08-15 16:32 UTC (permalink / raw)
  To: gitgitgadget; +Cc: Git List, Junio C Hamano, Johannes Schindelin

On Wed, Aug 15, 2018 at 10:33 AM Johannes Schindelin via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> 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 <johannes.schindelin@gmx.de>
> ---
> 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-08-15 16:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-15 14:33 [PATCH 0/1] Fix make -C t chainlint with DOS line endings Johannes Schindelin via GitGitGadget
2018-08-15 14:33 ` [PATCH 1/1] chainlint: fix for core.autocrlf=true Johannes Schindelin via GitGitGadget
2018-08-15 16:31   ` Junio C Hamano
2018-08-15 16:32   ` Eric Sunshine

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 NNTP newsgroup(s).