Web lists-archives.com

Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)

On Fri, May 03, 2019 at 03:09:51PM +0100, Andrew Molyneux wrote:
> Encoding name was erroneously documented as UTF-16-LE-BOM; this should
> in fact be UTF-16LE-BOM (no hyphen between '16' and 'LE').
> ---
>  Documentation/gitattributes.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index 9b41f81c06..bdd11a2ddd 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -346,7 +346,7 @@ automatic line ending conversion based on your platform.
>  Use the following attributes if your '*.ps1' files are UTF-16 little
>  endian encoded without BOM and you want Git to use Windows line endings
> -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
> +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
>  you want UTF-16 little endian with BOM).
>  Please note, it is highly recommended to
>  explicitly define the line endings with `eol` if the `working-tree-encoding`
> --
> 2.21.0.windows.1

Thanks for the patch.

I think that patch 1/2  is in upstream Git,
and even in git-for-windows/master - on which codebase are you ?

commit e6e15194a85af68db9f9ce076eb32c47e7063b3c
   gitattributes.txt: fix typo

    `UTF-16-LE-BOM` to `UTF-16LE-BOM`.

    this closes https://github.com/git-for-windows/git/issues/2095

    Signed-off-by: Yash Bhatambare <ybhatambare@xxxxxxxxx>
    Signed-off-by: Torsten Bögershausen <tboegi@xxxxxx>
    Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
 -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
 +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if

Patch 2/2 makes sense and cleans up my mess.