diff --git a/cmd/README.md b/cmd/README.md new file mode 100644 index 00000000..dc87c8d6 --- /dev/null +++ b/cmd/README.md @@ -0,0 +1,3 @@ +# CMD + +testing read me \ No newline at end of file diff --git a/pkg/git/manager.go b/pkg/git/manager.go index 3bf0b99b..9e76379b 100644 --- a/pkg/git/manager.go +++ b/pkg/git/manager.go @@ -30,7 +30,7 @@ func (rm *RepoManager) Clone(ctx context.Context, cloneUrl, branchName string) ( } rm.lock.Lock() - defer rm.lock.Unlock() // just for safety's sake + //defer rm.lock.Unlock() // just for safety's sake rm.repos = append(rm.repos, repo) return repo, nil @@ -38,7 +38,7 @@ func (rm *RepoManager) Clone(ctx context.Context, cloneUrl, branchName string) ( func (rm *RepoManager) Cleanup() { rm.lock.Lock() - defer rm.lock.Unlock() + //defer rm.lock.Unlock() for _, repo := range rm.repos { repo.Wipe() diff --git a/pkg/git/repo.go b/pkg/git/repo.go index 05652154..27fc5711 100644 --- a/pkg/git/repo.go +++ b/pkg/git/repo.go @@ -20,7 +20,6 @@ import ( "github.com/zapier/kubechecks/pkg" "github.com/zapier/kubechecks/pkg/config" "github.com/zapier/kubechecks/pkg/vcs" - "github.com/zapier/kubechecks/telemetry" ) type Repo struct { @@ -119,10 +118,10 @@ func (r *Repo) MergeIntoTarget(ctx context.Context, sha string) error { defer span.End() cmd := r.execCommand("git", "merge", sha) - out, err := cmd.CombinedOutput() + _, err := cmd.CombinedOutput() if err != nil { - telemetry.SetError(span, err, "merge commit into branch") - log.Error().Err(err).Msgf("unable to merge %s, %s", sha, out) + //telemetry.SetError(span, err, "merge commit into branch") + //log.Error().Err(err).Msgf("unable to merge %s, %s", sha, out) return err }