From c439c4fa093711d42e1b01acb1235b52004753c1 Mon Sep 17 00:00:00 2001
From: Di Xu <dixudx@users.noreply.github.com>
Date: Mon, 19 Mar 2018 14:20:04 +0800
Subject: [PATCH 1/2] Terminate the stripping of flags when -- is found (#649)

---
 command.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command.go b/command.go
index 29675b33..15b81127 100644
--- a/command.go
+++ b/command.go
@@ -475,6 +475,9 @@ Loop:
 		s := args[0]
 		args = args[1:]
 		switch {
+		case s == "--":
+			// "--" terminates the flags
+			break Loop
 		case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasNoOptDefVal(s[2:], flags):
 			// If '--flag arg' then
 			// delete arg from args.

From a1f051bc3eba734da4772d60e2d677f47cf93ef4 Mon Sep 17 00:00:00 2001
From: Michael <michael-k@users.noreply.github.com>
Date: Wed, 21 Mar 2018 14:39:34 +0000
Subject: [PATCH 2/2] Update the Travis and CircleCI Go versions (#651)

---
 .circleci/config.yml | 4 ++--
 .travis.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 136e17f0..bbba32b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,11 +26,11 @@ version: 2
 jobs:
   go-current:
     docker:
-      - image: circleci/golang:1.8.3
+      - image: circleci/golang:1.10.0
     <<: *base
   go-previous:
     docker:
-      - image: circleci/golang:1.7.6
+      - image: circleci/golang:1.9.4
     <<: *base
   go-latest:
     docker:
diff --git a/.travis.yml b/.travis.yml
index 68efa136..5afcb209 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: go
 
 matrix:
   include:
-    - go: 1.7.6
-    - go: 1.8.3
+    - go: 1.9.4
+    - go: 1.10.0
     - go: tip
   allow_failures:
     - go: tip