Merge pull request #3208 from git-lfs/ttaylorr/go-mod

all: use Go modules instead of Glide

Author: ttaylorr

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   bootstrap:
     macos:
       xcode: "9.2.0"
-    working_directory: ~/go/src/github.com/git-lfs/git-lfs
+    working_directory: ~/src/git-lfs
     steps:
       - checkout
       - run: brew update
@@ -14,20 +14,19 @@ jobs:
       - run: brew upgrade gettext || brew install gettext
       - run:
           command: git clone https://github.com/git/git.git git-source
-          working_directory: ~/go/src/github.com/git-lfs/git-lfs
+          working_directory: ~/src/git-lfs
       - run: echo "export GOPATH=$HOME/go" >> $BASH_ENV
-      - run: go get -d -v github.com/spf13/cobra
-      - run: go get -d -v github.com/ThomsonReutersEikon/go-ntlm/ntlm
       - save_cache:
           key: git-lfs-{{ .Branch }}-{{ .Revision }}
           paths:
             - /usr/local/Cellar
+            - ~/src/git-lfs
             - ~/go
 
   build_with_system_git:
     macos:
       xcode: "9.2.0"
-    working_directory: ~/go/src/github.com/git-lfs/git-lfs
+    working_directory: ~/src/git-lfs
     environment:
       GIT_SOURCE_REPO: https://github.com/git/git.git
     steps:
@@ -42,7 +41,7 @@ jobs:
   build_with_earliest_supported_git:
     macos:
       xcode: "9.2.0"
-    working_directory: ~/go/src/github.com/git-lfs/git-lfs
+    working_directory: ~/src/git-lfs
     environment:
       GIT_EARLIEST_SUPPORTED_VERSION: v2.0.0
       GIT_SOURCE_REPO: https://github.com/git/git.git
@@ -63,7 +62,7 @@ jobs:
   build_with_latest_git:
     macos:
       xcode: "9.2.0"
-    working_directory: ~/go/src/github.com/git-lfs/git-lfs
+    working_directory: ~/src/git-lfs
     environment:
       GIT_LATEST_SOURCE_BRANCH: master
       GIT_SOURCE_REPO: https://github.com/git/git.git

.travis.yml

@@ -8,6 +8,7 @@ os:
 
 env:
   global:
+    - GIT_LFS_SRC_DIR="$HOME/src/git-lfs"
     - GIT_LFS_TEST_DIR="$HOME/git-lfs-tests"
     - GIT_SOURCE_REPO="https://github.com/git/git.git"
     - GIT_EARLIEST_SUPPORTED_VERSION="v2.0.0
@@ -21,6 +22,7 @@ matrix:
       os: linux
       before_script:
         - >
+          cd "$GIT_LFS_SRC_DIR";
           git clone $GIT_SOURCE_REPO git-source;
           cd git-source;
           git checkout $GIT_LATEST_SOURCE_BRANCH;
@@ -31,6 +33,7 @@ matrix:
       os: linux
       before_script:
         - >
+          cd "$GIT_LFS_SRC_DIR";
           git clone $GIT_SOURCE_REPO git-source;
           cd git-source;
           git checkout $GIT_EARLIEST_SUPPORTED_VERSION;
@@ -48,15 +51,9 @@ matrix:
 
 before_install:
   - >
-    repo=`basename $PWD`;
-    localDir=`dirname $PWD`;
-    cfDir="`dirname $localDir`/git-lfs";
-    if [[ "$localDir" != "$cfDir" ]];
-    then
-      mv "$localDir" "$cfDir";
-      cd ../../git-lfs/$repo;
-      export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$repo;
-    fi;
+    mkdir -p "$(dirname "$GIT_LFS_SRC_DIR")";
+    mv "$TRAVIS_BUILD_DIR" "$GIT_LFS_SRC_DIR";
+    export TRAVIS_BUILD_DIR="$GIT_LFS_SRC_DIR";
 
 install: true
 

CONTRIBUTING.md

@@ -117,7 +117,7 @@ tests:
 
 ## Updating 3rd party packages
 
-0. Update `glide.yaml`.
+0. Update `go.mod`.
 0. Run `make vendor` to update the code in the `vendor` directory.
 0. Commit the change.  Git LFS vendors the full source code in the repository.
 0. Submit a pull request.

Makefile

@@ -40,9 +40,6 @@ EXTRA_GC_FLAGS =
 # GC_FLAGS are the union of the above two BUILTIN_GC_FLAGS and EXTRA_GC_FLAGS.
 GC_FLAGS = $(BUILTIN_GC_FLAGS) $(EXTRA_GC_FLAGS)
 
-# GLIDE is the name of the 'glide' binary used to manage vendored dependencies.
-GLIDE ?= glide
-
 # RONN is the name of the 'ronn' program used to generate man pages.
 RONN ?= ronn
 # RONN_EXTRA_ARGS are extra arguments given to the $(RONN) program when invoked.
@@ -205,7 +202,6 @@ resource.syso : \
 versioninfo.json script/windows-installer/git-lfs-logo.bmp \
 script/windows-installer/git-lfs-logo.ico \
 script/windows-installer/git-lfs-wizard-image.bmp
-	@$(GO) get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
 	$(GO) generate
 
 # RELEASE_TARGETS is the set of all release artifacts that we generate over a
@@ -298,17 +294,16 @@ test : fmt
 integration : bin/git-lfs$(X)
 	make -C t test
 
-# glide.lock is the permanent record of the glide.yaml file, and it is built by
-# running 'glide update'.
-glide.lock : glide.yaml
-	$(GLIDE) update
+# go.sum is a lockfile based on the contents of go.mod.
+go.sum : go.mod
+	$(GO) mod verify >/dev/null
 
-# vendor updates the glide.lock-file, and installs vendored dependencies into
+# vendor updates the go.sum-file, and installs vendored dependencies into
 # the vendor/ sub-tree, removing sub-packages (listed below) that are unused by
-# Git LFS.
+# Git LFS as well as test code.
 .PHONY : vendor
-vendor : glide.lock
-	$(GLIDE) install
+vendor : go.mod
+	$(GO) mod vendor -v
 	$(RM) -r vendor/github.com/ThomsonReutersEikon/go-ntlm/utils
 	$(RM) -r vendor/github.com/davecgh/go-spew
 	$(RM) -r vendor/github.com/pmezard/go-difflib
@@ -332,9 +327,13 @@ endif
 # are vendored in via vendor (see: above).
 .PHONY : lint
 lint : $(SOURCES)
-	@$(GO) list -f '{{ join .Deps "\n" }}' . \
-	| $(XARGS) $(GO) list -f '{{ if not .Standard }}{{ .ImportPath }}{{ end }}' \
-	| $(GREP) -v "github.com/git-lfs/git-lfs" || exit 0
+	@! $(GO) list -f '{{ join .Deps "\n" }}' . \
+	| $(XARGS) $(GO) list -f \
+		'{{ if and (not .Standard) (not .Module) }} \
+			{{ .ImportPath }} \
+		{{ end }}' \
+	| $(GREP) -v "github.com/git-lfs/git-lfs" \
+	| $(GREP) "."
 
 # MAN_ROFF_TARGETS is a list of all ROFF-style targets in the man pages.
 MAN_ROFF_TARGETS = man/git-lfs-checkout.1 \

appveyor.yml

@@ -8,7 +8,7 @@ environment:
   GOPATH: C:\Users\appveyor\go
   MSYSTEM: MINGW64
 
-clone_folder: $(GOPATH)\src\github.com\git-lfs\git-lfs
+clone_folder: $(USERPROFILE)\src\git-lfs
 
 install:
   - rd C:\Go /s /q
@@ -17,12 +17,15 @@ install:
   - curl -sL -o go1.11.windows-amd64.zip https://storage.googleapis.com/golang/go1.11.windows-amd64.zip
   - 7z x go1.11.windows-amd64.zip -oC:\ >nul
   - C:\go\bin\go version
+  - cd %USERPROFILE%\src
+  - C:\go\bin\go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
+  - cd %USERPROFILE%\src\git-lfs
   - cinst InnoSetup -y
   - cinst strawberryperl -y
   - refreshenv
   - cinst make
   - refreshenv
-  - set PATH=%GOPATH%\bin\windows_386;%PATH%
+  - set PATH=%GOPATH%\bin;%PATH%
   - ps: |
       echo "Go directories in machine PATH environment:"
       [environment]::GetEnvironmentVariable("PATH","Machine").split(";") | Select-String -Pattern "\\go\\"

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DH_OPTIONS
-export GO15VENDOREXPERIMENT=1
+export GO111MODULE=on
 
 #dh_golang doesn't do this for you
 ifeq ($(DEB_HOST_ARCH), i386)

glide.lock

@@ -0,0 +1,22 @@
+module github.com/git-lfs/git-lfs
+
+require (
+	github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0
+	github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858
+	github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 // indirect
+	github.com/git-lfs/gitobj v0.0.0-20180705162808-0fcb9c3796fa
+	github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
+	github.com/git-lfs/wildmatch v0.0.0-20180706170425-b31c34466d64
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/kr/pty v0.0.0-20150511174710-5cf931ef8f76
+	github.com/olekukonko/ts v0.0.0-20140412220145-ecf753e7c962
+	github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17
+	github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 // indirect
+	github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086
+	github.com/spf13/cobra v0.0.0-20150809222549-c55cdf33856a
+	github.com/spf13/pflag v0.0.0-20150814225300-580b9be06c33 // indirect
+	github.com/stretchr/testify v0.0.0-20160504130155-6cb3b85ef5a0
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d
+)

glide.yaml

@@ -0,0 +1,42 @@
+github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0 h1:iBnLwXNz+Mz2K6MndIM9a4sLBb+TouHB8s0tvx16s4s=
+github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0/go.mod h1:0eFwySJYxbNw/r8cJ01IeztpJfwrgrmiLtYig80Yvrc=
+github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858 h1:OZQyEhf4BviydsRdmK4ryeJHotDLd7vL1X8+nnxXkfk=
+github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 h1:5zdDAMuB3gvbHB1m2BZT9+t9w+xaBmK3ehb7skDXcwM=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/git-lfs/gitobj v0.0.0-20180705162808-0fcb9c3796fa h1:wXVStqoJoNE3tbW33kGIHBRVtUWL7GJxfEmDuBiueFo=
+github.com/git-lfs/gitobj v0.0.0-20180705162808-0fcb9c3796fa/go.mod h1:+OqrxLkyEiaSZ7Tz/McVIlPU+p69Dj25MaB3QqV4nN4=
+github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 h1:7Th0eBA4rT8WJNiM1vppjaIv9W5WJinhpbCJvRJxloI=
+github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI=
+github.com/git-lfs/wildmatch v0.0.0-20180706170425-b31c34466d64 h1:ZPW4Gapp3/5fc/LDTp0A/C+s74yZg9jVZBoVan0GSmM=
+github.com/git-lfs/wildmatch v0.0.0-20180706170425-b31c34466d64/go.mod h1:SdHAGnApDpnFYQ0vAxbniWR0sn7yLJ3QXo9RRfhn2ew=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/kr/pty v0.0.0-20150511174710-5cf931ef8f76 h1:i5TIRQpbCg4aJMUtVHIhkQnSw++Z405Z5pzqHqeNkdU=
+github.com/kr/pty v0.0.0-20150511174710-5cf931ef8f76/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/olekukonko/ts v0.0.0-20140412220145-ecf753e7c962 h1:3ev7csw9n4tLCxb5mtYXooCeQIFmC8Iw+4VhrSBy4zk=
+github.com/olekukonko/ts v0.0.0-20140412220145-ecf753e7c962/go.mod h1:F/7q8/HZz+TXjlsoZQQKVYvXTZaFH4QRa3y+j1p7MS0=
+github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17 h1:chPfVn+gpAM5CTpTyVU9j8J+xgRGwmoDlNDLjKnJiYo=
+github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 h1:GD+A8+e+wFkqje55/2fOVnZPkoDIu1VooBWfNrnY8Uo=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086 h1:mncRSDOqYCng7jOD+Y6+IivdRI6Kzv2BLWYkWkdQfu0=
+github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086/go.mod h1:YpdgDXpumPB/+EGmGTYHeiW/0QVFRzBYTNFaxWfPDk4=
+github.com/spf13/cobra v0.0.0-20150809222549-c55cdf33856a h1:pYw8mElqJwrz3T7QVT2EZw1Te6gHW+cOGsuOuRzNdRo=
+github.com/spf13/cobra v0.0.0-20150809222549-c55cdf33856a/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v0.0.0-20150814225300-580b9be06c33 h1:JZTN3XaDcPNAKb/i98hWdKD3C0wNQ8ehJRQHcg9eQ10=
+github.com/spf13/pflag v0.0.0-20150814225300-580b9be06c33/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/testify v0.0.0-20160504130155-6cb3b85ef5a0 h1:aCHp55cT6UsXkzGy9PoE+pNlDIbLIwcqK35xEnAKWfw=
+github.com/stretchr/testify v0.0.0-20160504130155-6cb3b85ef5a0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d h1:BJPiQVOMMtJsJIkrF4T6K3RKbzqr7rkaybMk33dlGUo=
+github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c h1:qgOY6WgZOaTkIIMiVjBQcw93ERBE4m30iBm00nkL0i8=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+rsc.io/quote v1.5.2 h1:w5fcysjrx7yqtD/aO+QwRjYZOKnaM9Uh2b40tElTs3Y=
+rsc.io/quote v1.5.2/go.mod h1:LzX7hefJvL54yjefDEDHNONDjII0t9xZLPXsUe+TKr0=
+rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=