Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • gitlab-org/gitlab-elasticsearch-indexer
  • mgresko/gitlab-elasticsearch-indexer
2 results
Show changes
Commits on Source (2)
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