Merge pull request #387 from ankitm123/ignore-root-gituser

fix: ignore root git user

Author: jenkins-x-bot

.jx/updatebot.yaml

@@ -17,6 +17,7 @@ spec:
                 - jx-pipeline
                 - jx-admin
                 - jx-preview
+                - jx-updatebot
             package: github.com/jenkins-x/jx-helpers
             upgradePackages:
               include:

pkg/gitclient/setup.go

@@ -13,17 +13,17 @@ import (
 	"github.com/pkg/errors"
 )
 
-var (
-	info = termcolor.ColorInfo
-)
+var info = termcolor.ColorInfo
 
 // EnsureUserAndEmailSetup returns the user name and email for the gitter
 // lazily setting them if they are blank either from the given values or if they are empty
 // using environment variables `GIT_AUTHOR_NAME` and `GIT_AUTHOR_EMAIL` or using default values
 func EnsureUserAndEmailSetup(gitter Interface, dir string, gitUserName string, gitUserEmail string) (string, string, error) {
 	userName, _ := gitter.Command(dir, "config", "--get", "user.name")
 	userEmail, _ := gitter.Command(dir, "config", "--get", "user.email")
-	if userName == "" {
+	// Seems like changing it to alpine image, results in username being set to root
+	// ToDo(@ankitm123): Look at why this happened in alpine go image and not the normal go image
+	if userName == "" || userName == "root" {
 		userName = gitUserName
 		if userName == "" {
 			userName = os.Getenv("GIT_AUTHOR_NAME")