Fix log messages (#152)

Signed-off-by: Reinhard Nägele <[email protected]>
helm · Apr 25, 2019 · e2e0c8c · e2e0c8c
1 parent f1712a6
commit e2e0c8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go
@@ -269,7 +269,7 @@ func (t *Testing) processCharts(action func(chart *Chart) TestResult) ([]TestRes
 		return results, nil
 	}
 
-	charts := []*Chart{}
+	var charts []*Chart
 	for _, dir := range chartDirs {
 		chart, err := NewChart(dir)
 		if err != nil {
@@ -647,7 +647,7 @@ func (t *Testing) FindChartDirsToBeProcessed() ([]string, error) {
 func (t *Testing) computeMergeBase() (string, error) {
 	err := t.git.ValidateRepository()
 	if err != nil {
-		return "", fmt.Errorf("Must be in a git repository")
+		return "", errors.New("Must be in a git repository")
 	}
 	return t.git.MergeBase(fmt.Sprintf("%s/%s", t.config.Remote, t.config.TargetBranch), "HEAD")
 }

diff --git a/pkg/tool/git.go b/pkg/tool/git.go
@@ -72,5 +72,6 @@ func (g Git) GetUrlForRemote(remote string) (string, error) {
 }
 
 func (g Git) ValidateRepository() error {
-	return g.exec.RunProcess("git", "rev-parse", "--is-inside-work-tree")
+	_, err := g.exec.RunProcessAndCaptureOutput("git", "rev-parse", "--is-inside-work-tree")
+	return err
 }