update Makefile to better switch to correct branch on updatedeps

This commit is contained in:
Mitchell Hashimoto 2015-01-16 09:37:16 -08:00
parent 87948b68fc
commit a7cad594df
1 changed files with 4 additions and 6 deletions

View File

@ -22,14 +22,12 @@ testrace: generate
TF_ACC= go test -race $(TEST) $(TESTARGS)
updatedeps:
@# This just checks out the current branch/tag/commit again so
@# that the `git checkout -` works below. We do this to preserve our
@# location since `go get` always puts us back on the master branch.
@sh -c "git checkout `git symbolic-ref --short HEAD 2>/dev/null \
|| git rev-parse HEAD`"
$(eval REF := $(shell sh -c "\
git symbolic-ref --short HEAD 2>/dev/null \
|| git rev-parse HEAD"))
go get -u golang.org/x/tools/cmd/stringer
go get -f -u -v ./...
git checkout -
git checkout $(REF)
generate:
go generate ./...