Merge pull request #83 from ljfranklin/PR-add-git-logging

Add additional logging to git driver
concourse · Apr 24, 2020 · a7e3de1 · a7e3de1
2 parents 9a35b60 + 905d2ad
commit a7e3de1
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/driver/git.go b/driver/git.go
@@ -363,6 +363,7 @@ func (driver *GitDriver) writeVersion(newVersion semver.Version) (bool, error) {
 	commitOutput, err := gitCommit.CombinedOutput()
 
 	if strings.Contains(string(commitOutput), nothingToCommitString) {
+		os.Stderr.Write([]byte("Nothing to commit, skipping version push\n"))
 		return true, nil
 	}
 
@@ -376,15 +377,10 @@ func (driver *GitDriver) writeVersion(newVersion semver.Version) (bool, error) {
 
 	pushOutput, err := gitPush.CombinedOutput()
 
-	if strings.Contains(string(pushOutput), falsePushString) {
-		return false, nil
-	}
-
-	if strings.Contains(string(pushOutput), pushRejectedString) {
-		return false, nil
-	}
-
-	if strings.Contains(string(pushOutput), pushRemoteRejectedString) {
+	if strings.Contains(string(pushOutput), falsePushString) ||
+		strings.Contains(string(pushOutput), pushRejectedString) ||
+		strings.Contains(string(pushOutput), pushRemoteRejectedString) {
+		os.Stderr.Write(pushOutput)
 		return false, nil
 	}