Skip to content

Commit 985f614

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 090b4da + 17c3d48 commit 985f614

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

compat/mingw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,9 +3252,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
32523252
DACL_SECURITY_INFORMATION,
32533253
&sid, NULL, NULL, NULL, &descriptor);
32543254

3255-
if (err != ERROR_SUCCESS)
3256-
error(_("failed to get owner for '%s' (%ld)"), path, err);
3257-
else if (sid && IsValidSid(sid)) {
3255+
if (err == ERROR_SUCCESS && sid && IsValidSid(sid)) {
32583256
/* Now, verify that the SID matches the current user's */
32593257
static PSID current_user_sid;
32603258
BOOL is_member;

setup.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1780,10 +1780,19 @@ const char *setup_git_directory_gently(int *nongit_ok)
17801780
break;
17811781
case GIT_DIR_INVALID_OWNERSHIP:
17821782
if (!nongit_ok) {
1783+
struct strbuf prequoted = STRBUF_INIT;
17831784
struct strbuf quoted = STRBUF_INIT;
17841785

17851786
strbuf_complete(&report, '\n');
1786-
sq_quote_buf_pretty(&quoted, dir.buf);
1787+
1788+
#ifdef __MINGW32__
1789+
if (dir.buf[0] == '/')
1790+
strbuf_addstr(&prequoted, "%(prefix)/");
1791+
#endif
1792+
1793+
strbuf_add(&prequoted, dir.buf, dir.len);
1794+
sq_quote_buf_pretty(&quoted, prequoted.buf);
1795+
17871796
die(_("detected dubious ownership in repository at '%s'\n"
17881797
"%s"
17891798
"To add an exception for this directory, call:\n"

0 commit comments

Comments
 (0)