Merge pull request #34 from xmudrii/fix-ensure-gitconfig

k8s-ci-robot · web-flow · commit e0046a087a11 · 2022-02-08T07:26:56.000-08:00
CheckGitConfigExists: properly handle non-existing config
diff --git a/mage/git.go b/mage/git.go
@@ -39,10 +39,7 @@ func CheckGitConfigExists() (bool, error) {
 	)
 
 	stream, err := userName.RunSuccessOutput()
-	if err != nil {
-		return false, errors.Wrapf(err, "getting git %s", gitConfigNameKey)
-	}
-	if stream.OutputTrimNL() == "" {
+	if err != nil || stream.OutputTrimNL() == "" {
 		return false, nil
 	}
 
@@ -55,10 +52,7 @@ func CheckGitConfigExists() (bool, error) {
 	)
 
 	stream, err = userEmail.RunSuccessOutput()
-	if err != nil {
-		return false, errors.Wrapf(err, "getting git %s", gitConfigEmailKey)
-	}
-	if stream.OutputTrimNL() == "" {
+	if err != nil || stream.OutputTrimNL() == "" {
 		return false, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,7 @@ func CheckGitConfigExists() (bool, error) {`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`stream, err := userName.RunSuccessOutput()`
`42`		`- if err != nil {`
`43`		`- return false, errors.Wrapf(err, "getting git %s", gitConfigNameKey)`
`44`		`- }`
`45`		`- if stream.OutputTrimNL() == "" {`
	`42`	`+ if err != nil \|\| stream.OutputTrimNL() == "" {`
`46`	`43`	`return false, nil`
`47`	`44`	`}`
`48`	`45`
`@@ -55,10 +52,7 @@ func CheckGitConfigExists() (bool, error) {`
`55`	`52`	`)`
`56`	`53`
`57`	`54`	`stream, err = userEmail.RunSuccessOutput()`
`58`		`- if err != nil {`
`59`		`- return false, errors.Wrapf(err, "getting git %s", gitConfigEmailKey)`
`60`		`- }`
`61`		`- if stream.OutputTrimNL() == "" {`
	`55`	`+ if err != nil \|\| stream.OutputTrimNL() == "" {`
`62`	`56`	`return false, nil`
`63`	`57`	`}`
`64`	`58`