{"thread":{"id":"58975","subject":"[PATCH] Fix word \"does\" sticking to \"not\" by adding space","startedAt":"2022-12-19T02:27:25Z","lastAt":"2022-12-20T00:28:32Z","messageCount":2,"participants":["Sheepolution via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"469257","messageId":"pull.1393.git.git.1671416810927.gitgitgadget@gmail.com","threadId":"58975","inReplyTo":null,"subject":"[PATCH] Fix word \"does\" sticking to \"not\" by adding space","fromName":"Sheepolution via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-12-19T02:26:50Z","receivedAt":"2022-12-19T02:27:25Z","isPatch":true,"sender":{"key":"name:Sheepolution","avatar":null},"body":"From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <danielhaazen@hotmail.com>\n\nSigned-off-by: Daniël Haazen <danielhaazen@hotmail.com>\n---\n    git: fix word \"does\" sticking to \"not\" in message\n    \n    When a repository is on a FAT32 file system it will send a message to\n    the user explaining they should use git config --global --add\n    safe.directory. To prevent a long line in the file the message is made\n    up of two string literals. In this change the first literal has a space\n    added to it to fix the issue that the last and the first word of the two\n    literals stick together like the example image below.\n    \n    image\n    [https://user-images.githubusercontent.com/2232780/206909378-147775f8-e7f6-46e3-8746-17181cac69d2.png]\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1393%2FSheepolution%2Fpatch-1-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1393/Sheepolution/patch-1-v1\nPull-Request: https://github.com/git/git/pull/1393\n\n compat/mingw.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/compat/mingw.c b/compat/mingw.c\nindex d614f156df1..af397e68a1d 100644\n--- a/compat/mingw.c\n+++ b/compat/mingw.c\n@@ -2752,7 +2752,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)\n \t\t\t/*\n \t\t\t * On FAT32 volumes, ownership is not actually recorded.\n \t\t\t */\n-\t\t\tstrbuf_addf(report, \"'%s' is on a file system that does\"\n+\t\t\tstrbuf_addf(report, \"'%s' is on a file system that does \"\n \t\t\t\t    \"not record ownership\\n\", path);\n \t\t} else if (report) {\n \t\t\tLPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;\n\nbase-commit: 694cb1b2abfda78e60c8c74f1e761de6e852f0a2\n-- \ngitgitgadget\n"},{"id":"469326","messageId":"xmqqh6xq2a1g.fsf@gitster.g","threadId":"58975","inReplyTo":"pull.1393.git.git.1671416810927.gitgitgadget@gmail.com","subject":"Re: [PATCH] Fix word \"does\" sticking to \"not\" by adding space","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-12-20T00:28:27Z","receivedAt":"2022-12-20T00:28:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Sheepolution via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> Subject: Re: [PATCH] Fix word \"does\" sticking to \"not\" by adding space\n\nNot incorrect per-se, but the above fails to say a more important\nthing---where does the typo appear?\n\n    Subject: [PATCH] mingw: fix typo in an error message from ownership check\n\nor something, perhaps.\n\n> From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <danielhaazen@hotmail.com>\n\nHere is where the proposed log message goes, not ...\n\n> Signed-off-by: Daniël Haazen <danielhaazen@hotmail.com>\n> ---\n>     git: fix word \"does\" sticking to \"not\" in message\n\n>     \n>     When a repository is on a FAT32 file system it will send a message to\n>     the user explaining they should use git config --global --add\n>     safe.directory. To prevent a long line in the file the message is made\n>     up of two string literals. In this change the first literal has a space\n>     added to it to fix the issue that the last and the first word of the two\n>     literals stick together like the example image below.\n\n... here.\n\n     When a repository is on a FAT32 file system it will send a\n     message that the path ownership cannot be determined.  Fix a\n     typo in the message.\n\nshould be sufficient.\n\n> diff --git a/compat/mingw.c b/compat/mingw.c\n> index d614f156df1..af397e68a1d 100644\n> --- a/compat/mingw.c\n> +++ b/compat/mingw.c\n> @@ -2752,7 +2752,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)\n>  \t\t\t/*\n>  \t\t\t * On FAT32 volumes, ownership is not actually recorded.\n>  \t\t\t */\n> -\t\t\tstrbuf_addf(report, \"'%s' is on a file system that does\"\n> +\t\t\tstrbuf_addf(report, \"'%s' is on a file system that does \"\n>  \t\t\t\t    \"not record ownership\\n\", path);\n\nThanks for spotting the mistake.  Very much appreciated.\n"}]}