Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions string_to_string.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ func (s *stringToStringValue) Set(val string) error {
}
}

if *s.value == nil {
*s.value = make(map[string]string, len(out))
}
for k, v := range out {
(*s.value)[k] = v
}
Expand Down
14 changes: 14 additions & 0 deletions string_to_string_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,20 @@ func TestS2SWithDefault(t *testing.T) {
}
}

func TestS2SNilDefault(t *testing.T) {
var s2s map[string]string
f := NewFlagSet("test", ContinueOnError)
f.StringToStringVar(&s2s, "s2s", nil, "Command separated ls!")

arg := fmt.Sprintf("--s2s=%s", createS2SFlag(map[string]string{"a": "1", "b": "2"}))
if err := f.Parse([]string{arg}); err != nil {
t.Fatal("expected no error; got", err)
}
if s2s["a"] != "1" || s2s["b"] != "2" {
t.Fatalf("expected a=1,b=2 but got: %v", s2s)
}
}

func TestS2SCalledTwice(t *testing.T) {
var s2s map[string]string
f := setUpS2SFlagSet(&s2s)
Expand Down
Loading