Re: [PATCH v2 2/7] git-new-workdir: mark script as LF-only

From: Junio C Hamano <gitster@pobox.com>
Date: May 8, 2017, 05:11 UTC
Message-ID: <xmqqvapc7x1i.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <fbba7450f2d4475b6d9a0d740dc43e22c81b104e.1493891336.git.johannes.schindelin@gmx.de>

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

Show 12 quoted lines

> Bash does not handle scripts with CR/LF line endings correctly, therefore
> they *have* to be forced to LF-only line endings.
>
> Funnily enough, this fixes t3000-ls-files-others and
> t1021-rerere-in-workdir when git.git was checked out with
> core.autocrlf=true, as these test still use git-new-workdir (once `git
> worktree` is no longer marked as experimental, both scripts probably
> want to be ported to using that command instead).
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---

I wouldn't bother fixing these myself, but the above two credit lines are swapped. You wrote, then Jonathan reviewed (to which I'll append my own as the 'editor' of the history when I commit).

Show 11 quoted lines

>  contrib/workdir/.gitattributes | 1 +
>  1 file changed, 1 insertion(+)
>  create mode 100644 contrib/workdir/.gitattributes
>
> diff --git a/contrib/workdir/.gitattributes b/contrib/workdir/.gitattributes
> new file mode 100644
> index 00000000000..1f78c5d1bd3
> --- /dev/null
> +++ b/contrib/workdir/.gitattributes
> @@ -0,0 +1 @@
> +/git-new-workdir eol=lf