From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: git@vger•kernel.org, Jonathan Nieder <jrnieder@gmail•com>,
Jeff Hostetler <jeffhost@microsoft•com>
Subject: Re: [PATCH v2 1/7] Fix build with core.autocrlf=true
Date: Mon, 08 May 2017 14:08:21 +0900 [thread overview]
Message-ID: <xmqqzieo7x6i.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <0a2af24e3423e402e6607fdc69fcbeb8cfe5489a.1493891336.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Thu, 4 May 2017 11:49:20 +0200 (CEST)")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> When generating common-cmds.h, the Unix tools we use generally operate on
> the assumption that input and output deliminate their lines using LF-only
> line endings. Consequently, they would happily copy the CR byte verbatim
> into the strings in common-cmds.h, which in turn makes the C preprocessor
> barf (that interprets them as MacOS-style line endings). Therefore, we
> have to mark the input files as LF-only: command-list.txt and
> Documentation/git-*.txt.
I guess nobody in the Windows land opens the doc source with
Notepad, like experienced Git developers runs "less" on them as a
faster way than accessing HTMLized (or manified) versions, and
marking Documentation/git-*.txt explicitly as eol=lf is OK. That
was the only thing I had brief worry about this patch.
Thanks, will queue.
> diff --git a/.gitattributes b/.gitattributes
> index 320e33c327c..8ce9c6b8888 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -1,3 +1,9 @@
> * whitespace=!indent,trail,space
> *.[ch] whitespace=indent,trail,space diff=cpp
> -*.sh whitespace=indent,trail,space
> +*.sh whitespace=indent,trail,space eol=lf
> +*.perl eol=lf
> +*.pm eol=lf
> +/Documentation/git-*.txt eol=lf
> +/command-list.txt eol=lf
> +/GIT-VERSION-GEN eol=lf
> +/mergetools/* eol=lf
> diff --git a/git-gui/.gitattributes b/git-gui/.gitattributes
> index 33d07c06bd9..59cd41dbff7 100644
> --- a/git-gui/.gitattributes
> +++ b/git-gui/.gitattributes
> @@ -2,3 +2,4 @@
> * encoding=US-ASCII
> git-gui.sh encoding=UTF-8
> /po/*.po encoding=UTF-8
> +/GIT-VERSION-GEN eol=lf
next prev parent reply other threads:[~2017-05-08 5:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 12:29 [PATCH 0/5] Abide by our own rules regarding line endings Johannes Schindelin
2017-05-02 12:30 ` [PATCH 1/5] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-02 12:30 ` [PATCH 2/5] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-02 12:30 ` [PATCH 3/5] completion: mark bash " Johannes Schindelin
2017-05-02 12:30 ` [PATCH 4/5] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-02 12:30 ` [PATCH 5/5] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
2017-05-02 21:56 ` [PATCH 0/5] Abide by our own rules regarding " Jonathan Nieder
2017-05-03 14:23 ` Johannes Schindelin
2017-05-04 5:19 ` Junio C Hamano
2017-05-04 9:47 ` Johannes Schindelin
2017-05-04 15:04 ` Junio C Hamano
2017-05-04 18:48 ` Johannes Schindelin
2017-05-07 5:29 ` Junio C Hamano
2017-05-08 10:49 ` Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 0/7] " Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 1/7] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-08 5:08 ` Junio C Hamano [this message]
2017-05-04 9:49 ` [PATCH v2 2/7] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-08 5:11 ` Junio C Hamano
2017-05-04 9:49 ` [PATCH v2 3/7] completion: mark bash " Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 4/7] t3901: move supporting files into t/t3901/ Johannes Schindelin
2017-05-08 5:12 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 5/7] t4003, t4005, t4007 & t4008: handle CR/LF in t/README & t/diff-lib/README Johannes Schindelin
2017-05-08 5:14 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 6/7] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-08 5:22 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 7/7] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
2017-05-08 5:29 ` Junio C Hamano
2017-05-09 11:20 ` Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 0/6] Abide by our own rules regarding " Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 1/6] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-22 17:57 ` Jonathan Nieder
2017-05-23 3:35 ` Junio C Hamano
2017-05-23 9:01 ` Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 2/6] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 3/6] completion: mark bash " Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 4/6] t3901: move supporting files into t/t3901/ Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 5/6] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 6/6] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzieo7x6i.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jeffhost@microsoft$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox