3 files changed, 4 insertions, 25 deletions
diff --git a/repository/config_mem.go b/repository/config_mem.go
index d9126f39f..1639a25d4 100644
--- a/repository/config_mem.go
+++ b/repository/config_mem.go
@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -82,18 +81,12 @@ func (mc *MemConfig) ReadTimestamp(key string) (time.Time, error) {
 // RemoveAll remove all key/value pair matching the key prefix
 func (mc *MemConfig) RemoveAll(keyPrefix string) error {
 	keyPrefix = normalizeKey(keyPrefix)
-	found := false
 	for key := range mc.config {
 		if strings.HasPrefix(key, keyPrefix) {
 			delete(mc.config, key)
-			found = true
 		}
 	}
 
-	if !found {
-		return fmt.Errorf("section not found")
-	}
-
 	return nil
 }
 
diff --git a/repository/config_testing.go b/repository/config_testing.go
index 8c22934a7..f658708d1 100644
--- a/repository/config_testing.go
+++ b/repository/config_testing.go
@@ -56,7 +56,7 @@ func testConfig(t *testing.T, config Config) {
 	require.ErrorIs(t, err, ErrNoConfigEntry)
 
 	err = config.RemoveAll("section.nonexistingkey")
-	require.Error(t, err)
+	require.NoError(t, err)
 
 	err = config.RemoveAll("section.key")
 	require.NoError(t, err)
@@ -65,20 +65,17 @@ func testConfig(t *testing.T, config Config) {
 	require.ErrorIs(t, err, ErrNoConfigEntry)
 
 	err = config.RemoveAll("nonexistingsection")
-	require.Error(t, err)
+	require.NoError(t, err)
 
 	err = config.RemoveAll("section.time")
 	require.NoError(t, err)
 
 	err = config.RemoveAll("section")
-	require.Error(t, err)
+	require.NoError(t, err)
 
 	_, err = config.ReadString("section.key")
 	require.Error(t, err)
 
-	err = config.RemoveAll("section.key")
-	require.Error(t, err)
-
 	// section + subsections
 	require.NoError(t, config.StoreString("section.opt1", "foo"))
 	require.NoError(t, config.StoreString("section.opt2", "foo2"))
diff --git a/repository/gogit_config.go b/repository/gogit_config.go
index afa652b19..1427b3446 100644
--- a/repository/gogit_config.go
+++ b/repository/gogit_config.go
@@ -212,27 +212,16 @@ func (cw *goGitConfigWriter) RemoveAll(keyPrefix string) error {
 	case len(split) == 1:
 		if cfg.Raw.HasSection(split[0]) {
 			cfg.Raw.RemoveSection(split[0])
-		} else {
-			return fmt.Errorf("invalid key prefix")
-		}
-	default:
-		if !cfg.Raw.HasSection(split[0]) {
-			return fmt.Errorf("invalid key prefix")
 		}
+	case cfg.Raw.HasSection(split[0]):
 		section := cfg.Raw.Section(split[0])
 		rest := strings.Join(split[1:], ".")
 
-		ok := false
 		if section.HasSubsection(rest) {
 			section.RemoveSubsection(rest)
-			ok = true
 		}
 		if section.HasOption(rest) {
 			section.RemoveOption(rest)
-			ok = true
-		}
-		if !ok {
-			return fmt.Errorf("invalid key prefix")
 		}
 	}