fix: return error when cherry-pick fails for gitops env repo

jenkins-x · Oct 10, 2019 · 379f05c · 379f05c
1 parent 7cf5fb9
commit 379f05c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/gits/helpers.go b/pkg/gits/helpers.go
@@ -602,7 +602,7 @@ func ForkAndPullRepo(gitURL string, dir string, baseRef string, branchName strin
 					return "", "", nil, nil, errors.Wrapf(err, "running git reset --hard")
 				}
 			} else {
-				log.Logger().Warnf(errors.Wrapf(err, "Unable to cherry-pick %s", util.ColorWarning(c.SHA)).Error())
+				return "", "", nil, nil, errors.Wrapf(err, "Unable to cherry-pick %s", util.ColorWarning(c.SHA))
 			}
 		} else {
 			log.Logger().Infof("  Cherry-picked %s", c.OneLine())