Merge pull request #2031 from dearchap/issue_2030

command_test.go

@@ -3841,6 +3841,51 @@ func TestCommand_ParentCommand_Set(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestCommandStringDashOption(t *testing.T) {
+	tests := []struct {
+		name                string
+		shortOptionHandling bool
+		args                []string
+	}{
+		{
+			name: "double dash separate value",
+			args: []string{"foo", "--bar", "-", "test"},
+		},
+		{
+			name: "single dash separate value",
+			args: []string{"foo", "-bar", "-", "test"},
+		},
+		{
+			name:                "single dash combined value",
+			args:                []string{"foo", "-b-", "test"},
+			shortOptionHandling: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			cmd := &Command{
+				Name:                   "foo",
+				UseShortOptionHandling: test.shortOptionHandling,
+				Flags: []Flag{
+					&StringFlag{
+						Name:    "bar",
+						Aliases: []string{"b"},
+					},
+				},
+				Action: func(ctx context.Context, c *Command) error {
+					return nil
+				},
+			}
+
+			err := cmd.Run(buildTestContext(t), test.args)
+			assert.NoError(t, err)
+
+			assert.Equal(t, "-", cmd.String("b"))
+		})
+	}
+}
+
 func TestCommandReadArgsFromStdIn(t *testing.T) {
 	tests := []struct {
 		name          string

parse.go

@@ -93,7 +93,10 @@ func flagFromError(err error) (string, error) {
 
 func splitShortOptions(set *flag.FlagSet, arg string) []string {
 	shortFlagsExist := func(s string) bool {
-		for _, c := range s[1:] {
+		for index, c := range s[1:] {
+			if index == (len(s[1:])-1) && c == '-' {
+				break
+			}
 			if f := set.Lookup(string(c)); f == nil {
 				return false
 			}
@@ -107,7 +110,11 @@ func splitShortOptions(set *flag.FlagSet, arg string) []string {
 
 	separated := make([]string, 0, len(arg)-1)
 	for _, flagChar := range arg[1:] {
-		separated = append(separated, "-"+string(flagChar))
+		if flagChar != '-' {
+			separated = append(separated, "-"+string(flagChar))
+		} else {
+			separated = append(separated, "-")
+		}
 	}
 
 	return separated