Change to fork of libgit2 with version guard check.

Ensure Go Modules are disabled during build.
getsolus · Sep 10, 2019 · ba5a9da · ba5a9da
1 parent 7d4136b
commit ba5a9da
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -19,9 +19,9 @@
 [submodule "src/vendor/github.com/BurntSushi/toml"]
 	path = src/vendor/github.com/BurntSushi/toml
 	url = https://github.com/BurntSushi/toml.git
-[submodule "src/vendor/github.com/libgit2/git2go"]
-	path = src/vendor/github.com/libgit2/git2go
-	url = https://github.com/libgit2/git2go.git
+[submodule "src/vendor/github.com/JoshStrobl/git2go"]
+	path = src/vendor/github.com/JoshStrobl/git2go
+	url = https://github.com/JoshStrobl/git2go.git
 [submodule "src/vendor/github.com/cheggaaa/pb"]
 	path = src/vendor/github.com/cheggaaa/pb
 	url = https://github.com/cheggaaa/pb.git

diff --git a/Makefile.gobuild b/Makefile.gobuild
@@ -2,7 +2,7 @@ CUR_DIR = $(shell pwd)
 
 # "Normal" static binary
 %.statbin:
-	GOPATH=$(CUR_DIR) go install -v $(subst .statbin,,$@)
+	GO111MODULE=off GOPATH=$(CUR_DIR) go install -v $(subst .statbin,,$@)
 
 clean:
 	test ! -d $(CUR_DIR)/pkg || rm -rvf $(CUR_DIR)/pkg; \

diff --git a/src/builder/history.go b/src/builder/history.go
@@ -20,7 +20,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"github.com/libgit2/git2go"
+	"github.com/JoshStrobl/git2go"
 	"os"
 	"path/filepath"
 	"regexp"

diff --git a/src/builder/source/git.go b/src/builder/source/git.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"github.com/libgit2/git2go"
+	"github.com/JoshStrobl/git2go"
 	"github.com/solus-project/libosdev/commands"
 	"net/url"
 	"os"

diff --git a/src/vendor/github.com/JoshStrobl/git2go b/src/vendor/github.com/JoshStrobl/git2go
diff --git a/src/vendor/github.com/libgit2/git2go b/src/vendor/github.com/libgit2/git2go