diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c3438fe..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "github.com/pkg/sftp"] - path = vendored/github.com/pkg/sftp - url = git@github.com:tommie/sftp - branch = hardlink diff --git a/go.mod b/go.mod index 7caf1a4..1ed7aa0 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.16 require ( github.com/golang/glog v1.0.0 - github.com/pkg/sftp v1.13.4 + github.com/pkg/sftp v1.13.5-0.20211030161311-7adab6cb02e2 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 @@ -14,12 +14,4 @@ require ( golang.org/x/sync v0.0.0-20210220032951-036812b2e83c ) -require ( - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/kr/fs v0.1.0 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/vbauerster/mpb/v7 v7.1.5 // indirect - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect -) - -replace github.com/pkg/sftp => ./vendored/github.com/pkg/sftp +require github.com/vbauerster/mpb/v7 v7.1.5 diff --git a/go.sum b/go.sum index 4a4629c..03847fc 100644 --- a/go.sum +++ b/go.sum @@ -197,11 +197,10 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.13.4 h1:Lb0RYJCmgUcBgZosfoi9Y9sbl6+LJgOIgk/2Y4YjMFg= -github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8= +github.com/pkg/sftp v1.13.5-0.20211030161311-7adab6cb02e2 h1:VgH+V7UaRXmDqHSzP16tz3lrRyHPjxbtUHQhjsqqykc= +github.com/pkg/sftp v1.13.5-0.20211030161311-7adab6cb02e2/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -402,7 +401,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 h1:xrCZDmdtoloIiooiA9q0OQb9r8HejIHYoHGhGCe1pGg= golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/vendored/github.com/pkg/sftp b/vendored/github.com/pkg/sftp deleted file mode 160000 index 20a9511..0000000 --- a/vendored/github.com/pkg/sftp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20a9511799433c72ce3f092a3bf38a08a702e05c