Skip to content
Snippets Groups Projects
Commit 84fca734 authored by Nick Thomas's avatar Nick Thomas
Browse files

Merge branch '5-fix-from-sha-zeroes' into 'master'

Correctly handle a FROM_SHA value of 000000...

Closes #5

See merge request !5
parents 0cbc5910 9e4d0cb6
No related branches found
No related tags found
1 merge request!5Correctly handle a FROM_SHA value of 000000...
Pipeline #
Loading
Loading
@@ -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')
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
Loading
Loading
@@ -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)
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment