{"thread":{"id":"51027","subject":"[PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)","startedAt":"2019-05-03T14:10:01Z","lastAt":"2019-05-04T09:01:28Z","messageCount":4,"participants":["Andrew Molyneux","Torsten Bögershausen"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"374876","messageId":"20190503140952.9029-1-andrew.molyneux@neuxpower.com","threadId":"51027","inReplyTo":null,"subject":"[PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)","fromName":"Andrew Molyneux","fromEmail":"andrew.molyneux@neuxpower.com","sentAt":"2019-05-03T14:09:51Z","receivedAt":"2019-05-03T14:10:01Z","isPatch":true,"sender":{"key":"andrew.molyneux@neuxpower.com","avatar":"https://gravatar.com/avatar/13a838f0cb57322199f2d73b7784abbb3d816ec0b1a7132b92ad62671a2202ec?d=mp&s=160"},"body":"Encoding name was erroneously documented as UTF-16-LE-BOM; this should\nin fact be UTF-16LE-BOM (no hyphen between '16' and 'LE').\n---\n Documentation/gitattributes.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 9b41f81c06..bdd11a2ddd 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -346,7 +346,7 @@ automatic line ending conversion based on your platform.\n \n Use the following attributes if your '*.ps1' files are UTF-16 little\n endian encoded without BOM and you want Git to use Windows line endings\n-in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if\n+in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if\n you want UTF-16 little endian with BOM).\n Please note, it is highly recommended to\n explicitly define the line endings with `eol` if the `working-tree-encoding`\n-- \n2.21.0.windows.1\n\n"},{"id":"374877","messageId":"20190503140952.9029-2-andrew.molyneux@neuxpower.com","threadId":"51027","inReplyTo":"20190503140952.9029-1-andrew.molyneux@neuxpower.com","subject":"[PATCH 2/2] tests: fix typo (UTF-16LE-BOM) in test name","fromName":"Andrew Molyneux","fromEmail":"andrew.molyneux@neuxpower.com","sentAt":"2019-05-03T14:09:52Z","receivedAt":"2019-05-03T14:10:14Z","isPatch":true,"sender":{"key":"andrew.molyneux@neuxpower.com","avatar":"https://gravatar.com/avatar/13a838f0cb57322199f2d73b7784abbb3d816ec0b1a7132b92ad62671a2202ec?d=mp&s=160"},"body":"Encoding name was erroneously referred to as UTF-16-LE-BOM in name of\ntest; this should in fact be UTF-16LE-BOM (no hyphen between '16' and\n'LE').\n---\n t/t0028-working-tree-encoding.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh\nindex 1090e650ed..9a05993ce5 100755\n--- a/t/t0028-working-tree-encoding.sh\n+++ b/t/t0028-working-tree-encoding.sh\n@@ -79,7 +79,7 @@ test_expect_success 're-encode to UTF-16 on checkout' '\n \ttest_cmp_bin test.utf16.raw test.utf16\n '\n \n-test_expect_success 're-encode to UTF-16-LE-BOM on checkout' '\n+test_expect_success 're-encode to UTF-16LE-BOM on checkout' '\n \trm test.utf16lebom &&\n \tgit checkout test.utf16lebom &&\n \ttest_cmp_bin test.utf16lebom.raw test.utf16lebom\n-- \n2.21.0.windows.1\n\n"},{"id":"374886","messageId":"20190503170148.km4ftgg6gbgzd6pn@tb-raspi4","threadId":"51027","inReplyTo":"20190503140952.9029-1-andrew.molyneux@neuxpower.com","subject":"Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2019-05-03T17:01:48Z","receivedAt":"2019-05-03T17:01:53Z","isPatch":true,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On Fri, May 03, 2019 at 03:09:51PM +0100, Andrew Molyneux wrote:\n> Encoding name was erroneously documented as UTF-16-LE-BOM; this should\n> in fact be UTF-16LE-BOM (no hyphen between '16' and 'LE').\n> ---\n> Documentation/gitattributes.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\n> index 9b41f81c06..bdd11a2ddd 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -346,7 +346,7 @@ automatic line ending conversion based on your platform.\n>\n> Use the following attributes if your '*.ps1' files are UTF-16 little\n> endian encoded without BOM and you want Git to use Windows line endings\n> -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if\n> +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if\n> you want UTF-16 little endian with BOM).\n> Please note, it is highly recommended to\n> explicitly define the line endings with `eol` if the `working-tree-encoding`\n> --\n> 2.21.0.windows.1\n>\n\nThanks for the patch.\n\nI think that patch 1/2 is in upstream Git,\nand even in git-for-windows/master - on which codebase are you ?\n\ncommit e6e15194a85af68db9f9ce076eb32c47e7063b3c\n gitattributes.txt: fix typo\n\n `UTF-16-LE-BOM` to `UTF-16LE-BOM`.\n\n this closes https://github.com/git-for-windows/git/issues/2095\n\n Signed-off-by: Yash Bhatambare \n Signed-off-by: Torsten Bögershausen \n Signed-off-by: Junio C Hamano \n[snip]\n -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if\n +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if\n\n\nPatch 2/2 makes sense and cleans up my mess.\n\n"},{"id":"374897","messageId":"CAJzfGS_9qUBbOEjEZxSJdRTJfVBowghM=c1Zn0oh9j03LPhpCw@mail.gmail.com","threadId":"51027","inReplyTo":"20190503170148.km4ftgg6gbgzd6pn@tb-raspi4","subject":"Re: [PATCH 1/2] doc/gitattributes: fix typo (UTF-16LE-BOM)","fromName":"Andrew Molyneux","fromEmail":"andrew.molyneux@neuxpower.com","sentAt":"2019-05-04T09:00:50Z","receivedAt":"2019-05-04T09:01:28Z","isPatch":true,"sender":{"key":"andrew.molyneux@neuxpower.com","avatar":"https://gravatar.com/avatar/13a838f0cb57322199f2d73b7784abbb3d816ec0b1a7132b92ad62671a2202ec?d=mp&s=160"},"body":"On Fri, 3 May 2019 at 18:01, Torsten Bögershausen wrote:\n[snip]\n> I think that patch 1/2 is in upstream Git,\n> and even in git-for-windows/master - on which codebase are you ?\n>\nSorry, it's my first time submitting a patch, so I'm probably somewhat\nincompetent :D\nI was trying to follow the instructions in\ngit/Documentation/SubmittingPatches and based my patches on the\n\"maint\" branch from https://github.com/git/git.git.\n\n- Andrew\n"}]}