update and vendor deps

Author: jwaldrip

Makefile

@@ -1,14 +1,8 @@
-GIT2GO=github.com/libgit2/git2go
-
 build: get-dependencies
 	go build -o ./bin/git-get
 
 install: get-dependencies
 	go install
 
 get-dependencies:
-	go get -u github.com/jwaldrip/odin
-	go get -u github.com/jwaldrip/tint
-	go get -u github.com/bgentry/speakeasy
-	go get -u -d $(GIT2GO)
-	cd $(GOPATH)/src/$(GIT2GO) && git submodule update --init && make install
+	cd vendor/github.com/libgit2/git2go && git submodule update --init && make install

VERSION.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "0.1.0"
+var version = "0.2.0"

callbacks.go

@@ -15,7 +15,7 @@ func calcPercent(partial, total uint) uint {
 }
 
 func buildCertificateCheckCallback(u *url.URL) git.CertificateCheckCallback {
-	return func(cert *git.Certificate, valid bool, hostname string) int {
+	return func(cert *git.Certificate, valid bool, hostname string) git.ErrorCode {
 		if u.Scheme != "ssh" && valid == false {
 			exitWithMsg("host key check failed for:", hostname)
 		}
@@ -24,16 +24,16 @@ func buildCertificateCheckCallback(u *url.URL) git.CertificateCheckCallback {
 }
 
 func buildCredentialsCallback(u *url.URL) git.CredentialsCallback {
-	return func(url, usernameFromURL string, allowedTypes git.CredType) (int, *git.Cred) {
+	return func(url, usernameFromURL string, allowedTypes git.CredType) (git.ErrorCode, *git.Cred) {
 		i, cred := git.NewCredDefault()
 
 		if allowedTypes&git.CredTypeUserpassPlaintext != 0 {
 			i, cred = git.NewCredUserpassPlaintext(getInput("username"), getMaskedInput("password"))
-			return i, &cred
+			return git.ErrorCode(i), &cred
 		}
 		if allowedTypes&git.CredTypeSshKey != 0 {
 			i, cred = git.NewCredSshKeyFromAgent(u.User.Username())
-			return i, &cred
+			return git.ErrorCode(i), &cred
 		}
 		if allowedTypes&git.CredTypeSshCustom != 0 {
 			exitWithMsg("custom ssh not implemented")
@@ -43,16 +43,16 @@ func buildCredentialsCallback(u *url.URL) git.CredentialsCallback {
 			exitWithMsg("invalid cred type")
 		}
 
-		return i, &cred
+		return git.ErrorCode(i), &cred
 	}
 }
 
-func sidebandProgressCallback(str string) int {
+func sidebandProgressCallback(str string) git.ErrorCode {
 	fmt.Printf("\rremote: %v", str)
 	return 0
 }
 
-func transferProgressCallback(stats git.TransferProgress) int {
+func transferProgressCallback(stats git.TransferProgress) git.ErrorCode {
 	i.stats = stats
-	return i.update()
+	return git.ErrorCode(i.update())
 }

options.go

@@ -7,14 +7,16 @@ import (
 )
 
 func cloneOptionsForURL(u *url.URL) *git.CloneOptions {
-	remoteCallbacks := &git.RemoteCallbacks{
+	remoteCallbacks := git.RemoteCallbacks{
 		SidebandProgressCallback: sidebandProgressCallback,
 		TransferProgressCallback: transferProgressCallback,
 		CredentialsCallback:      buildCredentialsCallback(u),
 		CertificateCheckCallback: buildCertificateCheckCallback(u),
 	}
 	return &git.CloneOptions{
+		FetchOptions: &git.FetchOptions{
+			RemoteCallbacks: remoteCallbacks,
+		},
 		Bare:            false,
-		RemoteCallbacks: remoteCallbacks,
 	}
 }