Skip to content

Commit 095374a

Browse files
derrickstoleedscho
authored andcommitted
Merge pull request #3791: Various fixes around safe.directory
The first three commits are rebased versions of those in gitgitgadget#1215. These allow the following: 1. Fix `git config --global foo.bar <path>` from allowing the `<path>`. As a bonus, users with a config value starting with `/` will not get a warning about "old-style" paths needing a "`%(prefix)/`". 2. When in WSL, the path starts with `/` so it needs to be interpolated properly. Update the warning to include `%(prefix)/` to get the right value for WSL users. (This is specifically for using Git for Windows from Git Bash, but in a WSL directory.) 3. When using WSL, the ownership check fails and reports an error message. This is noisy, and happens even if the user has marked the path with `safe.directory`. Remove that error message.
2 parents 92556d9 + 565e020 commit 095374a

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

compat/mingw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3037,9 +3037,7 @@ int is_path_owned_by_current_sid(const char *path)
30373037
DACL_SECURITY_INFORMATION,
30383038
&sid, NULL, NULL, NULL, &descriptor);
30393039

3040-
if (err != ERROR_SUCCESS)
3041-
error(_("failed to get owner for '%s' (%ld)"), path, err);
3042-
else if (sid && IsValidSid(sid)) {
3040+
if (err == ERROR_SUCCESS && sid && IsValidSid(sid)) {
30433041
/* Now, verify that the SID matches the current user's */
30443042
static PSID current_user_sid;
30453043
BOOL is_member;

setup.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,6 +1479,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
14791479
break;
14801480
case GIT_DIR_INVALID_OWNERSHIP:
14811481
if (!nongit_ok) {
1482+
struct strbuf prequoted = STRBUF_INIT;
14821483
struct strbuf quoted = STRBUF_INIT;
14831484
struct strbuf hint = STRBUF_INIT;
14841485

@@ -1491,7 +1492,14 @@ const char *setup_git_directory_gently(int *nongit_ok)
14911492
"again for more information."));
14921493
#endif
14931494

1494-
sq_quote_buf_pretty(&quoted, dir.buf);
1495+
#ifdef __MINGW32__
1496+
if (dir.buf[0] == '/')
1497+
strbuf_addstr(&prequoted, "%(prefix)/");
1498+
#endif
1499+
1500+
strbuf_add(&prequoted, dir.buf, dir.len);
1501+
sq_quote_buf_pretty(&quoted, prequoted.buf);
1502+
14951503
die(_("detected dubious ownership in repository at '%s'\n"
14961504
"To add an exception for this directory, call:\n"
14971505
"\n"

0 commit comments

Comments
 (0)