From f02af7a48b4afbe9e5bfe473c3377fead6123796 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 22 Sep 2020 15:57:50 -0700 Subject: [PATCH] remove default master branch in cloner --- api/internal/git/cloner.go | 47 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/api/internal/git/cloner.go b/api/internal/git/cloner.go index 6f377fb19..6df8dca21 100644 --- a/api/internal/git/cloner.go +++ b/api/internal/git/cloner.go @@ -27,9 +27,6 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error { return err } - if repoSpec.Ref == "" { - repoSpec.Ref = "master" - } cmd := exec.Command( gitProgram, "clone", @@ -45,28 +42,30 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error { repoSpec.CloneSpec(), repoSpec.Dir.String()) } - cmd = exec.Command( - gitProgram, - "fetch", - "--depth=1", - "origin", - repoSpec.Ref) - cmd.Dir = repoSpec.Dir.String() - out, err = cmd.CombinedOutput() - if err != nil { - log.Printf("Error fetching ref: %s", out) - return errors.Wrapf(err, "trouble fetching %s", repoSpec.Ref) - } + if repoSpec.Ref != "" { + cmd = exec.Command( + gitProgram, + "fetch", + "--depth=1", + "origin", + repoSpec.Ref) + cmd.Dir = repoSpec.Dir.String() + out, err = cmd.CombinedOutput() + if err != nil { + log.Printf("Error fetching ref: %s", out) + return errors.Wrapf(err, "trouble fetching %s", repoSpec.Ref) + } - cmd = exec.Command( - gitProgram, - "checkout", - "FETCH_HEAD") - cmd.Dir = repoSpec.Dir.String() - out, err = cmd.CombinedOutput() - if err != nil { - log.Printf("Error checking out ref: %s", out) - return errors.Wrapf(err, "trouble checking out %s", repoSpec.Ref) + cmd = exec.Command( + gitProgram, + "checkout", + "FETCH_HEAD") + cmd.Dir = repoSpec.Dir.String() + out, err = cmd.CombinedOutput() + if err != nil { + log.Printf("Error checking out ref: %s", out) + return errors.Wrapf(err, "trouble checking out %s", repoSpec.Ref) + } } cmd = exec.Command(