Skip to content

Commit 8733f4b

Browse files
authored
use quoted regexp instead of git fixed-value (#20030)
Backport #20029
1 parent a180d94 commit 8733f4b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Diff for: modules/git/git.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"fmt"
1212
"os"
1313
"os/exec"
14+
"regexp"
1415
"runtime"
1516
"strings"
1617
"sync"
@@ -337,7 +338,7 @@ func configSetNonExist(key, value string) error {
337338
}
338339

339340
func configAddNonExist(key, value string) error {
340-
_, _, err := NewCommand(DefaultContext, "config", "--fixed-value", "--get", key, value).RunStdString(nil)
341+
_, _, err := NewCommand(DefaultContext, "config", "--get", key, regexp.QuoteMeta(value)).RunStdString(nil)
341342
if err == nil {
342343
// already exist
343344
return nil
@@ -357,7 +358,7 @@ func configUnsetAll(key, value string) error {
357358
_, _, err := NewCommand(DefaultContext, "config", "--get", key).RunStdString(nil)
358359
if err == nil {
359360
// exist, need to remove
360-
_, _, err = NewCommand(DefaultContext, "config", "--global", "--fixed-value", "--unset-all", key, value).RunStdString(nil)
361+
_, _, err = NewCommand(DefaultContext, "config", "--global", "--unset-all", key, regexp.QuoteMeta(value)).RunStdString(nil)
361362
if err != nil {
362363
return fmt.Errorf("failed to unset git global config %s, err: %w", key, err)
363364
}

Diff for: modules/git/git_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,10 @@ func TestGitConfig(t *testing.T) {
7878

7979
assert.NoError(t, configUnsetAll("test.key-b", "val-2b"))
8080
assert.False(t, gitConfigContains("key-b = val-2b"))
81+
82+
assert.NoError(t, configSet("test.key-x", "*"))
83+
assert.True(t, gitConfigContains("key-x = *"))
84+
assert.NoError(t, configSetNonExist("test.key-x", "*"))
85+
assert.NoError(t, configUnsetAll("test.key-x", "*"))
86+
assert.False(t, gitConfigContains("key-x = *"))
8187
}

0 commit comments

Comments
 (0)