Skip to contentSkip to conversation

Fix word "does" sticking to "not" by adding space

PATCH In review Sheepolution via GitGitGadget 2 participants 2 messages Dec 19, 2022 – Dec 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix word "does" sticking to "not" by adding space

From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <[email protected]>

---
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(-)
compat/mingw.c +1 -1
index d614f156df1..af397e68a1d 100644
@@ -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

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 1 line · Sheepolution via GitGitGadget

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.

Quoted 1 line

From: =?UTF-8?q?Dani=C3=ABl=20Haazen?= <[email protected]>

Here is where the proposed log message goes, not ...

Quoted 11 lines

---
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.

compat/mingw.c int is_path_owned_by_current_sid(const char *path, struct strbuf *report) · line 2756

Quoted 11 lines
compat/mingw.c +1 -1
index d614f156df1..af397e68a1d 100644
@@ -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.