diff options
Diffstat (limited to 'repository')
-rw-r--r-- | repository/config.go | 6 | ||||
-rw-r--r-- | repository/gogit_config.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/repository/config.go b/repository/config.go index 4d6a8c6c..781a0c1d 100644 --- a/repository/config.go +++ b/repository/config.go @@ -96,7 +96,7 @@ func (m *mergedConfig) ReadBool(key string) (bool, error) { if err == nil { return v, nil } - if !errors.Is(err, ErrNoConfigEntry) && err != ErrMultipleConfigEntry { + if !errors.Is(err, ErrNoConfigEntry) && !errors.Is(err, ErrMultipleConfigEntry) { return false, err } return m.global.ReadBool(key) @@ -107,7 +107,7 @@ func (m *mergedConfig) ReadString(key string) (string, error) { if err == nil { return val, nil } - if !errors.Is(err, ErrNoConfigEntry) && err != ErrMultipleConfigEntry { + if !errors.Is(err, ErrNoConfigEntry) && !errors.Is(err, ErrMultipleConfigEntry) { return "", err } return m.global.ReadString(key) @@ -118,7 +118,7 @@ func (m *mergedConfig) ReadTimestamp(key string) (time.Time, error) { if err == nil { return val, nil } - if !errors.Is(err, ErrNoConfigEntry) && err != ErrMultipleConfigEntry { + if !errors.Is(err, ErrNoConfigEntry) && !errors.Is(err, ErrMultipleConfigEntry) { return time.Time{}, err } return m.global.ReadTimestamp(key) diff --git a/repository/gogit_config.go b/repository/gogit_config.go index 87141e9d..2bdbadc0 100644 --- a/repository/gogit_config.go +++ b/repository/gogit_config.go @@ -130,7 +130,7 @@ func (cr *goGitConfigReader) ReadString(key string) (string, error) { return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) } if len(section.OptionAll(optionName)) > 1 { - return "", ErrMultipleConfigEntry + return "", fmt.Errorf("%w: duplicated key %s", ErrMultipleConfigEntry, key) } return section.Option(optionName), nil default: @@ -144,7 +144,7 @@ func (cr *goGitConfigReader) ReadString(key string) (string, error) { return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) } if len(subsection.OptionAll(optionName)) > 1 { - return "", ErrMultipleConfigEntry + return "", fmt.Errorf("%w: duplicated key %s", ErrMultipleConfigEntry, key) } return subsection.Option(optionName), nil } |