зеркало из https://github.com/microsoft/git.git
config: treat user and xdg config permission problems as errors
Git reads multiple configuration files: settings come first from the system config file (typically /etc/gitconfig), then the xdg config file (typically ~/.config/git/config), then the user's dotfile (~/.gitconfig), then the repository configuration (.git/config). Git has always used access(2) to decide whether to use each file; as an unfortunate side effect, that means that if one of these files is unreadable (e.g., EPERM or EIO), git skips it. So if I use ~/.gitconfig to override some settings but make a mistake and give it the wrong permissions then I am subject to the settings the sysadmin chose for /etc/gitconfig. Better to error out and ask the user to correct the problem. This only affects the user and xdg config files, since the user presumably has enough access to fix their permissions. If the system config file is unreadable, the best we can do is to warn about it so the user knows to notify someone and get on with work in the meantime. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e5c52c9898
Коммит
96b9e0e313
4
config.c
4
config.c
|
@ -945,12 +945,12 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
|
||||||
found += 1;
|
found += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xdg_config && !access_or_warn(xdg_config, R_OK)) {
|
if (xdg_config && !access_or_die(xdg_config, R_OK)) {
|
||||||
ret += git_config_from_file(fn, xdg_config, data);
|
ret += git_config_from_file(fn, xdg_config, data);
|
||||||
found += 1;
|
found += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user_config && !access_or_warn(user_config, R_OK)) {
|
if (user_config && !access_or_die(user_config, R_OK)) {
|
||||||
ret += git_config_from_file(fn, user_config, data);
|
ret += git_config_from_file(fn, user_config, data);
|
||||||
found += 1;
|
found += 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -609,6 +609,7 @@ int remove_or_warn(unsigned int mode, const char *path);
|
||||||
* (ENOENT or ENOTDIR).
|
* (ENOENT or ENOTDIR).
|
||||||
*/
|
*/
|
||||||
int access_or_warn(const char *path, int mode);
|
int access_or_warn(const char *path, int mode);
|
||||||
|
int access_or_die(const char *path, int mode);
|
||||||
|
|
||||||
/* Warn on an inaccessible file that ought to be accessible */
|
/* Warn on an inaccessible file that ought to be accessible */
|
||||||
void warn_on_inaccessible(const char *path);
|
void warn_on_inaccessible(const char *path);
|
||||||
|
|
|
@ -416,6 +416,14 @@ int access_or_warn(const char *path, int mode)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int access_or_die(const char *path, int mode)
|
||||||
|
{
|
||||||
|
int ret = access(path, mode);
|
||||||
|
if (ret && errno != ENOENT && errno != ENOTDIR)
|
||||||
|
die_errno(_("unable to access '%s'"), path);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
struct passwd *xgetpwuid_self(void)
|
struct passwd *xgetpwuid_self(void)
|
||||||
{
|
{
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче