diff --git a/Gopkg.lock b/Gopkg.lock index 0554c19d..9a060c1b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,89 +2,114 @@ [[projects]] + digest = "1:289dd4d7abfb3ad2b5f728fbe9b1d5c1bf7d265a3eb9ef92869af1f7baba4c7a" name = "github.com/BurntSushi/toml" packages = ["."] + pruneopts = "" revision = "b26d9c308763d68093482582cea63d69be07a0f0" version = "v0.3.0" [[projects]] + digest = "1:c9bebdae4ac52d0c3bbe5876de3d72f3bb05b4986865cdb3f15e305e1dc4fbca" name = "github.com/fatih/color" packages = ["."] + pruneopts = "" revision = "570b54cabe6b8eb0bc2dfce68d964677d63b5260" version = "v1.5.0" [[projects]] branch = "master" + digest = "1:304c322b62533a48ac052ffee80f67087fce1bc07186cd4e610a1b0e77765836" name = "github.com/hashicorp/errwrap" packages = ["."] + pruneopts = "" revision = "7554cd9344cec97297fa6649b055a8c98c2a1e55" [[projects]] branch = "master" + digest = "1:b46ef59de1f724e8a2b508ea2b329eaf6cac4d71cbd44ad5e3dbd4e8fd49de9b" name = "github.com/hashicorp/go-multierror" packages = ["."] + pruneopts = "" revision = "b7773ae218740a7be65057fc60b366a49b538a44" [[projects]] branch = "master" + digest = "1:37c711e2b87d952a420327775c4e7bf325483b0fbbb63db97f7e9b5b67a03372" name = "github.com/haya14busa/go-vimlparser" packages = [ ".", "ast", "go", - "token" + "token", ] + pruneopts = "" revision = "6c96c660fcd05c64565e1d7bad3691a6810e738d" [[projects]] branch = "master" + digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f" name = "github.com/jbenet/go-context" packages = ["io"] + pruneopts = "" revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4" [[projects]] + digest = "1:9ea83adf8e96d6304f394d40436f2eb44c1dc3250d223b74088cc253a6cd0a1c" name = "github.com/mattn/go-colorable" packages = ["."] + pruneopts = "" revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" version = "v0.0.9" [[projects]] + digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c" name = "github.com/mattn/go-isatty" packages = ["."] + pruneopts = "" revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" version = "v0.0.3" [[projects]] branch = "master" + digest = "1:59d11e81d6fdd12a771321696bb22abdd9a94d26ac864787e98c9b419e428734" name = "github.com/mitchellh/go-homedir" packages = ["."] + pruneopts = "" revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" [[projects]] branch = "master" + digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" name = "github.com/sergi/go-diff" packages = ["diffmatchpatch"] + pruneopts = "" revision = "1744e2970ca51c86172c8190fadad617561ed6e7" [[projects]] + digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c" name = "github.com/src-d/gcfg" packages = [ ".", "scanner", "token", - "types" + "types", ] + pruneopts = "" revision = "f187355171c936ac84a82793659ebb4936bc1c23" version = "v1.3.0" [[projects]] - branch = "master" + digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f" name = "github.com/xanzy/ssh-agent" packages = ["."] - revision = "ba9c9e33906f58169366275e3450db66139a31a9" + pruneopts = "" + revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c" + version = "v0.2.0" [[projects]] branch = "master" + digest = "1:c3415eeb330bf30a2d8181e516ec79804c198f3d171ab9c9364f29dbe76c05d9" name = "golang.org/x/crypto" packages = [ "curve25519", @@ -92,24 +117,30 @@ "ed25519/internal/edwards25519", "ssh", "ssh/agent", - "ssh/knownhosts" + "ssh/knownhosts", ] + pruneopts = "" revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122" [[projects]] branch = "master" + digest = "1:447831205e1c85dbf1e6f97cb8ca54931452c6aff79c630ea091ecbbdc2e921e" name = "golang.org/x/net" packages = ["context"] + pruneopts = "" revision = "a8b9294777976932365dabb6640cf1468d95c70f" [[projects]] branch = "master" + digest = "1:134679482ac3fd5ecd60c1412510d52272e29e1085bf2dd2d7e79e2d1d38acc0" name = "golang.org/x/sys" packages = ["unix"] + pruneopts = "" revision = "83801418e1b59fb1880e363299581ee543af32ca" [[projects]] branch = "master" + digest = "1:f327aaa70ddb1a01208c3b1e655e79374662c1abc77053484b5cf1cd0d46ca03" name = "golang.org/x/text" packages = [ "internal/gen", @@ -117,23 +148,27 @@ "internal/ucd", "transform", "unicode/cldr", - "unicode/norm" + "unicode/norm", ] + pruneopts = "" revision = "57961680700a5336d15015c8c50686ca5ba362a4" [[projects]] + digest = "1:e1b484fdba1d9927133fc8b8c52a808d83d20847e630470dbe82bc12429fe76c" name = "gopkg.in/src-d/go-billy.v3" packages = [ ".", "helper/chroot", "helper/polyfill", "osfs", - "util" + "util", ] + pruneopts = "" revision = "c329b7bc7b9d24905d2bc1b85bfa29f7ae266314" version = "v3.1.0" [[projects]] + digest = "1:33a44878d7740876cbc407c114ba7721a98b9041bb9e80397b07c92f1d714f67" name = "gopkg.in/src-d/go-git.v4" packages = [ ".", @@ -175,20 +210,34 @@ "utils/merkletrie/filesystem", "utils/merkletrie/index", "utils/merkletrie/internal/frame", - "utils/merkletrie/noder" + "utils/merkletrie/noder", ] + pruneopts = "" revision = "f9879dd043f84936a1f8acb8a53b74332a7ae135" version = "v4.0.0-rc15" [[projects]] + digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac" name = "gopkg.in/warnings.v0" packages = ["."] + pruneopts = "" revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b" version = "v0.1.2" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "b1abfdb1122cba036acff15042e704f2621de2eb3348e5751a2eb4fe46112e4a" + input-imports = [ + "github.com/BurntSushi/toml", + "github.com/fatih/color", + "github.com/hashicorp/go-multierror", + "github.com/haya14busa/go-vimlparser", + "github.com/haya14busa/go-vimlparser/ast", + "github.com/haya14busa/go-vimlparser/token", + "github.com/mattn/go-colorable", + "gopkg.in/src-d/go-git.v4", + "gopkg.in/src-d/go-git.v4/plumbing", + "gopkg.in/src-d/go-git.v4/plumbing/object", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Makefile b/Makefile index 0788d9de..5335e30a 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ release: $(BIN_DIR)/$(NAME) exe=$$exe.exe; \ fi; \ echo "Creating $$exe ... (os=$$os, arch=$$arch)"; \ - GOOS=$$os GOARCH=$$arch go build -tags netgo -installsuffix netgo -ldflags "$(RELEASE_LDFLAGS)" -o $$exe; \ + GOOS=$$os GOARCH=$$arch GO111MODULE=off go build -tags netgo -installsuffix netgo -ldflags "$(RELEASE_LDFLAGS)" -o $$exe; \ done; \ done diff --git a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go b/vendor/github.com/xanzy/ssh-agent/pageant_windows.go index 3507b022..62956079 100644 --- a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go +++ b/vendor/github.com/xanzy/ssh-agent/pageant_windows.go @@ -29,8 +29,8 @@ import ( "errors" "fmt" "sync" - . "syscall" - . "unsafe" + "syscall" + "unsafe" ) // Maximum size of message can be sent to pageant @@ -53,7 +53,7 @@ const ( type copyData struct { dwData uintptr cbData uint32 - lpData Pointer + lpData unsafe.Pointer } var ( @@ -65,7 +65,7 @@ var ( ) func winAPI(dllName, funcName string) func(...uintptr) (uintptr, uintptr, error) { - proc := MustLoadDLL(dllName).MustFindProc(funcName) + proc := syscall.MustLoadDLL(dllName).MustFindProc(funcName) return func(a ...uintptr) (uintptr, uintptr, error) { return proc.Call(a...) } } @@ -96,21 +96,21 @@ func query(msg []byte) ([]byte, error) { thID, _, _ := winGetCurrentThreadID() mapName := fmt.Sprintf("PageantRequest%08x", thID) - pMapName, _ := UTF16PtrFromString(mapName) + pMapName, _ := syscall.UTF16PtrFromString(mapName) - mmap, err := CreateFileMapping(InvalidHandle, nil, PAGE_READWRITE, 0, MaxMessageLen+4, pMapName) + mmap, err := syscall.CreateFileMapping(syscall.InvalidHandle, nil, syscall.PAGE_READWRITE, 0, MaxMessageLen+4, pMapName) if err != nil { return nil, err } - defer CloseHandle(mmap) + defer syscall.CloseHandle(mmap) - ptr, err := MapViewOfFile(mmap, FILE_MAP_WRITE, 0, 0, 0) + ptr, err := syscall.MapViewOfFile(mmap, syscall.FILE_MAP_WRITE, 0, 0, 0) if err != nil { return nil, err } - defer UnmapViewOfFile(ptr) + defer syscall.UnmapViewOfFile(ptr) - mmSlice := (*(*[MaxMessageLen]byte)(Pointer(ptr)))[:] + mmSlice := (*(*[MaxMessageLen]byte)(unsafe.Pointer(ptr)))[:] copy(mmSlice, msg) @@ -119,10 +119,10 @@ func query(msg []byte) ([]byte, error) { cds := copyData{ dwData: agentCopydataID, cbData: uint32(len(mapNameBytesZ)), - lpData: Pointer(&(mapNameBytesZ[0])), + lpData: unsafe.Pointer(&(mapNameBytesZ[0])), } - resp, _, _ := winSendMessage(paWin, wmCopydata, 0, uintptr(Pointer(&cds))) + resp, _, _ := winSendMessage(paWin, wmCopydata, 0, uintptr(unsafe.Pointer(&cds))) if resp == 0 { return nil, ErrSendMessage @@ -140,7 +140,7 @@ func query(msg []byte) ([]byte, error) { } func pageantWindow() uintptr { - nameP, _ := UTF16PtrFromString("Pageant") - h, _, _ := winFindWindow(uintptr(Pointer(nameP)), uintptr(Pointer(nameP))) + nameP, _ := syscall.UTF16PtrFromString("Pageant") + h, _, _ := winFindWindow(uintptr(unsafe.Pointer(nameP)), uintptr(unsafe.Pointer(nameP))) return h }