* [PATCH] Fix word "does" sticking to "not" by adding space
@ 2022-12-19 2:26 Sheepolution via GitGitGadget
2022-12-20 0:28 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Sheepolution via GitGitGadget @ 2022-12-19 2:26 UTC (permalink / raw)
To: git; +Cc: Sheepolution, Daniël Haazen
From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <danielhaazen@hotmail.com>
Signed-off-by: Daniël Haazen <danielhaazen@hotmail.com>
---
git: fix word "does" sticking to "not" in message
When a repository is on a FAT32 file system it will send a message to
the user explaining they should use git config --global --add
safe.directory. To prevent a long line in the file the message is made
up of two string literals. In this change the first literal has a space
added to it to fix the issue that the last and the first word of the two
literals stick together like the example image below.
image
[https://user-images.githubusercontent.com/2232780/206909378-147775f8-e7f6-46e3-8746-17181cac69d2.png]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1393%2FSheepolution%2Fpatch-1-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1393/Sheepolution/patch-1-v1
Pull-Request: https://github.com/git/git/pull/1393
compat/mingw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index d614f156df1..af397e68a1d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2752,7 +2752,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
/*
* On FAT32 volumes, ownership is not actually recorded.
*/
- strbuf_addf(report, "'%s' is on a file system that does"
+ strbuf_addf(report, "'%s' is on a file system that does "
"not record ownership\n", path);
} else if (report) {
LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
base-commit: 694cb1b2abfda78e60c8c74f1e761de6e852f0a2
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix word "does" sticking to "not" by adding space
2022-12-19 2:26 [PATCH] Fix word "does" sticking to "not" by adding space Sheepolution via GitGitGadget
@ 2022-12-20 0:28 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-12-20 0:28 UTC (permalink / raw)
To: Sheepolution via GitGitGadget; +Cc: git, Sheepolution
"Sheepolution via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Subject: Re: [PATCH] Fix word "does" sticking to "not" by adding space
Not incorrect per-se, but the above fails to say a more important
thing---where does the typo appear?
Subject: [PATCH] mingw: fix typo in an error message from ownership check
or something, perhaps.
> From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <danielhaazen@hotmail.com>
Here is where the proposed log message goes, not ...
> Signed-off-by: Daniël Haazen <danielhaazen@hotmail.com>
> ---
> git: fix word "does" sticking to "not" in message
>
> When a repository is on a FAT32 file system it will send a message to
> the user explaining they should use git config --global --add
> safe.directory. To prevent a long line in the file the message is made
> up of two string literals. In this change the first literal has a space
> added to it to fix the issue that the last and the first word of the two
> literals stick together like the example image below.
... here.
When a repository is on a FAT32 file system it will send a
message that the path ownership cannot be determined. Fix a
typo in the message.
should be sufficient.
> diff --git a/compat/mingw.c b/compat/mingw.c
> index d614f156df1..af397e68a1d 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -2752,7 +2752,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
> /*
> * On FAT32 volumes, ownership is not actually recorded.
> */
> - strbuf_addf(report, "'%s' is on a file system that does"
> + strbuf_addf(report, "'%s' is on a file system that does "
> "not record ownership\n", path);
Thanks for spotting the mistake. Very much appreciated.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-20 0:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-19 2:26 [PATCH] Fix word "does" sticking to "not" by adding space Sheepolution via GitGitGadget
2022-12-20 0:28 ` Junio C Hamano
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).