* [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)
@ 2019-05-03 14:09 Andrew Molyneux
2019-05-03 14:09 ` [PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name Andrew Molyneux
2019-05-03 17:01 ` [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Torsten Bögershausen
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Molyneux @ 2019-05-03 14:09 UTC (permalink / raw)
To: git; +Cc: Andrew Molyneux
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name
2019-05-03 14:09 [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Andrew Molyneux
@ 2019-05-03 14:09 ` Andrew Molyneux
2019-05-03 17:01 ` [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Torsten Bögershausen
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Molyneux @ 2019-05-03 14:09 UTC (permalink / raw)
To: git; +Cc: Andrew Molyneux
Encoding name was erroneously referred to as UTF-16-LE-BOM in name of
test; this should in fact be UTF-16LE-BOM (no hyphen between '16' and
'LE').
---
t/t0028-working-tree-encoding.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index 1090e650ed..9a05993ce5 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -79,7 +79,7 @@ test_expect_success 're-encode to UTF-16 on checkout' '
test_cmp_bin test.utf16.raw test.utf16
'
-test_expect_success 're-encode to UTF-16-LE-BOM on checkout' '
+test_expect_success 're-encode to UTF-16LE-BOM on checkout' '
rm test.utf16lebom &&
git checkout test.utf16lebom &&
test_cmp_bin test.utf16lebom.raw test.utf16lebom
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)
2019-05-03 14:09 [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Andrew Molyneux
2019-05-03 14:09 ` [PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name Andrew Molyneux
@ 2019-05-03 17:01 ` Torsten Bögershausen
2019-05-04 9:00 ` Andrew Molyneux
1 sibling, 1 reply; 4+ messages in thread
From: Torsten Bögershausen @ 2019-05-03 17:01 UTC (permalink / raw)
To: Andrew Molyneux; +Cc: git
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@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
[snip]
-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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)
2019-05-03 17:01 ` [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Torsten Bögershausen
@ 2019-05-04 9:00 ` Andrew Molyneux
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Molyneux @ 2019-05-04 9:00 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
On Fri, 3 May 2019 at 18:01, Torsten Bögershausen <tboegi@web.de> wrote:
[snip]
> I think that patch 1/2 is in upstream Git,
> and even in git-for-windows/master - on which codebase are you ?
>
Sorry, it's my first time submitting a patch, so I'm probably somewhat
incompetent :D
I was trying to follow the instructions in
git/Documentation/SubmittingPatches and based my patches on the
"maint" branch from https://github.com/git/git.git.
- Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-04 9:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-03 14:09 [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Andrew Molyneux
2019-05-03 14:09 ` [PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name Andrew Molyneux
2019-05-03 17:01 ` [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM) Torsten Bögershausen
2019-05-04 9:00 ` Andrew Molyneux
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).