github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69885 from clickyotomy/master 

Fix local copy path for `kubectl cp'.
pull/564/head
k8s-ci-robot 2018-11-28 23:31:21 -08:00 committed by GitHub
parent 2e80c3a0b2 00720ba51d
commit 64b96d426a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/cp/cp.go
View File

@ -315,8 +315,8 @@ func stripPathShortcuts(p string) string {
trimmed = strings.TrimPrefix(newPath, "../") trimmed = strings.TrimPrefix(newPath, "../")
} }
// trim leftover ".." // trim leftover {".", ".."}
if newPath == ".." { if newPath == "." || newPath == ".." {
newPath = "" newPath = ""
} }

5
pkg/kubectl/cmd/cp/cp_test.go
View File

@ -175,6 +175,11 @@ func TestStripPathShortcuts(t *testing.T) {
input: "...foo", input: "...foo",
expected: "...foo", expected: "...foo",
}, },
{
name: "test root directory",
input: "/",
expected: "",
},
} }
for _, test := range tests { for _, test := range tests {