Merge pull request #69885 from clickyotomy/master

Fix local copy path for `kubectl cp'.

Merge pull request #69885 from clickyotomy/master
64b96d42 · k8s-ci-robot · GitHub · 2e80c3a0 · 00720ba5 · 64b96d42
Unverified Commit 64b96d42 authored Nov 28, 2018 by k8s-ci-robot Committed by GitHub Nov 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

cp.go pkg/kubectl/cmd/cp/cp.go +2 -2

cp_test.go pkg/kubectl/cmd/cp/cp_test.go +5 -0

No files found.
--- a/pkg/kubectl/cmd/cp/cp.go
+++ b/pkg/kubectl/cmd/cp/cp.go
@@ -315,8 +315,8 @@ func stripPathShortcuts(p string) string {
 		trimmed = strings.TrimPrefix(newPath, "../")
 	}

-	// trim leftover ".."
-	if newPath == ".." {
+	// trim leftover {".", ".."}
+	if newPath == "." || newPath == ".." {
 		newPath = ""
 	}


--- a/pkg/kubectl/cmd/cp/cp_test.go
+++ b/pkg/kubectl/cmd/cp/cp_test.go
@@ -175,6 +175,11 @@ func TestStripPathShortcuts(t *testing.T) {
 			input:    "...foo",
 			expected: "...foo",
 		},
+		{
+			name:     "test root directory",
+			input:    "/",
+			expected: "",
+		},
 	}

 	for _, test := range tests {