mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/safe-directory-leading-path'

Browse Source 
The safe.directory configuration knob has been updated to
optionally allow leading path matches.

* jc/safe-directory-leading-path:
  safe.directory: allow "lead/ing/path/*" match
This commit is contained in:
Junio C Hamano
2024-06-12 13:37:16 -07:00
parent 22cf18fd9e 313eec177a
commit b8bdb2f283
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup.c
View File

@ -1230,13 +1230,20 @@ static int safe_directory_cb(const char *key, const char *value,
} else if (!strcmp(value, "*")) {
data->is_safe = 1;
} else {
char *interpolated = NULL;
char *allowed = NULL;
if (!git_config_pathname(&interpolated, key, value) &&
!fspathcmp(data->path, interpolated ? interpolated : value))
data->is_safe = 1;
free(interpolated);
if (!git_config_pathname(&allowed, key, value)) {
const char *check = allowed ? allowed : value;
if (ends_with(check, "/*")) {
size_t len = strlen(check);
if (!fspathncmp(check, data->path, len - 1))
data->is_safe = 1;
} else if (!fspathcmp(data->path, check)) {
data->is_safe = 1;
}
}
if (allowed != value)
free(allowed);
}
return 0;