Merge pull request #273 from alexflint/pass-dash-dash-through

Passing the no-more-options string "--" twice or more

2 files changed, 10 insertions, 1 deletions

diff --git a/parse.go b/parse.go
index 172c7cd..d9c73d0 100644
--- a/parse.go
+++ b/parse.go
@@ -615,7 +615,7 @@ func (p *Parser) process(args []string) error {
 	// must use explicit for loop, not range, because we manipulate i inside the loop
 	for i := 0; i < len(args); i++ {
 		arg := args[i]
-		if arg == "--" {
+		if arg == "--" && !allpositional {
 			allpositional = true
 			continue
 		}
diff --git a/parse_test.go b/parse_test.go
index 5bc781c..7e9cbf9 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -609,6 +609,15 @@ func TestNoMoreOptionsBeforeHelp(t *testing.T) {
 	assert.NotEqual(t, ErrHelp, err)
 }
 
+func TestNoMoreOptionsTwice(t *testing.T) {
+	var args struct {
+		X []string `arg:"positional"`
+	}
+	err := parse("-- --", &args)
+	require.NoError(t, err)
+	assert.Equal(t, []string{"--"}, args.X)
+}
+
 func TestHelpFlag(t *testing.T) {
 	var args struct {
 		Foo string