From 94b2b6b39111c87793d34d8a087cf49b19674f5e Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 13 Aug 2020 14:03:38 -0700 Subject: [PATCH] gofmt --- pkg/buildcontext/git.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/buildcontext/git.go b/pkg/buildcontext/git.go index 452e06961..0f20eb0c4 100644 --- a/pkg/buildcontext/git.go +++ b/pkg/buildcontext/git.go @@ -21,7 +21,6 @@ import ( "os" "strings" - "github.com/GoogleContainerTools/kaniko/pkg/constants" "github.com/go-git/go-billy/v5/osfs" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/config" @@ -31,6 +30,8 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/storage/filesystem" "github.com/sirupsen/logrus" + + "github.com/GoogleContainerTools/kaniko/pkg/constants" ) const ( @@ -69,7 +70,6 @@ func (g *Git) UnpackTarFromBuildContext() (string, error) { options.ReferenceName = plumbing.ReferenceName(parts[1]) } - if branch := g.opts.GitBranch; branch != "" { ref, err := getGitReferenceName(directory, url, branch) if err != nil { @@ -79,7 +79,7 @@ func (g *Git) UnpackTarFromBuildContext() (string, error) { } logrus.Debugf("Getting source from reference %s", options.ReferenceName) - _, err := git.PlainClone(directory, false, &options) + r, err := git.PlainClone(directory, false, &options) if err == nil && len(parts) > 2 { // ... retrieving the commit being pointed by HEAD @@ -101,7 +101,6 @@ func (g *Git) UnpackTarFromBuildContext() (string, error) { return directory, err } } - return directory, err }