diff options
| author | Philip Peterson <philip-peterson@users.noreply.github.com> | 2023-02-28 16:26:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 15:26:19 -0600 |
| commit | cbbd3726b4edb3c2bda59610050fd5af149fbdb1 (patch) | |
| tree | b9455f6bf0be36e0b6dd88dd3cf15312f9408f2a /modules | |
| parent | f5987c24e2b561952ebf9a2485b863325c16ee48 (diff) | |
| download | gitea-cbbd3726b4edb3c2bda59610050fd5af149fbdb1.tar.gz gitea-cbbd3726b4edb3c2bda59610050fd5af149fbdb1.zip | |
Pass `--global` when calling `git config --get`, for consistency with `git config --set` (#23157)
This arose out of #22451; it seems we are checking using non-global
settings to see if a config value is set, in order to decide whether to
call another global(-indeed) configuration command. This PR changes it
so that both the check and the set are for global configuration.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/git/git.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/git/git.go b/modules/git/git.go index 2feb242ac5..24cfea8c7f 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -312,7 +312,7 @@ func CheckGitVersionAtLeast(atLeast string) error { } func configSet(key, value string) error { - stdout, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err != nil && !err.IsExitCode(1) { return fmt.Errorf("failed to get git config %s, err: %w", key, err) } @@ -331,7 +331,7 @@ func configSet(key, value string) error { } func configSetNonExist(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err == nil { // already exist return nil @@ -349,7 +349,7 @@ func configSetNonExist(key, value string) error { } func configAddNonExist(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) if err == nil { // already exist return nil @@ -366,7 +366,7 @@ func configAddNonExist(key, value string) error { } func configUnsetAll(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err == nil { // exist, need to remove _, _, err = NewCommand(DefaultContext, "config", "--global", "--unset-all").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) |