diff --git a/Makefile b/Makefile index 9c8487c4374499cf7f88b2c7a1b7244b3d73f443..e6468f62aa0f3953c32db872f47a08a9a708e6dc 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,7 @@ setup: clean .GOPATH/.ok - ./bin/gvt fetch github.com/stretchr/testify/assert - mkdir tmp - git clone --bare https://gitlab.com/gitlab-org/gitlab-test.git tmp/gitlab-test.git + - git -C tmp/gitlab-test.git update-ref refs/heads/master b83d6e391c22777fca1ed3012fce84f633d7fed0 VERSION := $(shell git describe --tags --always --dirty="-dev") DATE := $(shell date -u '+%Y-%m-%d-%H%M UTC') diff --git a/git/go-git.go b/git/go-git.go index d35289d9549a49e49106583208f24f9c5962516f..a030ba44f0dc69b478e0d9753f0cba35f9ab670e 100644 --- a/git/go-git.go +++ b/git/go-git.go @@ -32,12 +32,9 @@ func NewGoGitRepository(projectPath string, fromSHA string, toSHA string) (*goGi return nil, err } out.Repository = repo + out.FromHash = plumbing.NewHash(fromSHA) - if fromSHA == "" { - out.FromHash = plumbing.ZeroHash - } else { - out.FromHash = plumbing.NewHash(fromSHA) - + if !out.FromHash.IsZero() { commit, err := repo.CommitObject(out.FromHash) if err != nil { return nil, fmt.Errorf("Bad from SHA (%s): %s", out.FromHash, err) diff --git a/integration_test.go b/integration_test.go index 651810a4699f97780738ad58318ed414b38941e3..91b34c83487beaf1d9374b4837056c9d8eb29ab8 100644 --- a/integration_test.go +++ b/integration_test.go @@ -67,10 +67,13 @@ func run(from, to string) error { cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr - if from != "" { - cmd.Env = append(cmd.Env, "FROM_SHA="+from) + // GitLab always sets FROM_SHA + if from == "" { + from = "0000000000000000000000000000000000000000" } + cmd.Env = append(cmd.Env, "FROM_SHA="+from) + if to != "" { cmd.Env = append(cmd.Env, "TO_SHA="+to) }