Skip to content

Commit bef29fb

Browse files
derrickstoleeGit for Windows Build Agent
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 57e7183 + f6f51d6 commit bef29fb

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
@@ -3128,9 +3128,7 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
31283128
DACL_SECURITY_INFORMATION,
31293129
&sid, NULL, NULL, NULL, &descriptor);
31303130

3131-
if (err != ERROR_SUCCESS)
3132-
error(_("failed to get owner for '%s' (%ld)"), path, err);
3133-
else if (sid && IsValidSid(sid)) {
3131+
if (err == ERROR_SUCCESS && sid && IsValidSid(sid)) {
31343132
/* Now, verify that the SID matches the current user's */
31353133
static PSID current_user_sid;
31363134
static HANDLE linked_token;

setup.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1879,10 +1879,19 @@ const char *setup_git_directory_gently(int *nongit_ok)
18791879
break;
18801880
case GIT_DIR_INVALID_OWNERSHIP:
18811881
if (!nongit_ok) {
1882+
struct strbuf prequoted = STRBUF_INIT;
18821883
struct strbuf quoted = STRBUF_INIT;
18831884

18841885
strbuf_complete(&report, '\n');
1885-
sq_quote_buf_pretty(&quoted, dir.buf);
1886+
1887+
#ifdef __MINGW32__
1888+
if (dir.buf[0] == '/')
1889+
strbuf_addstr(&prequoted, "%(prefix)/");
1890+
#endif
1891+
1892+
strbuf_add(&prequoted, dir.buf, dir.len);
1893+
sq_quote_buf_pretty(&quoted, prequoted.buf);
1894+
18861895
die(_("detected dubious ownership in repository at '%s'\n"
18871896
"%s"
18881897
"To add an exception for this directory, call:\n"

0 commit comments

Comments
 (0)