Merge pull request #435 from remotemobprogramming/434-push-options

fix #434 ci skip push option is evaluated incorrectly

Author: hollesse

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.0.1
+- Fix: The configuration option `MOB_SKIP_CI_PUSH_OPTION_ENABLED` now works correctly
+
+Thank you @stefanscheidt for reporting this issue
+
 # 5.0.0
 - Feature: You can now set goals
 - Feature: Can make use of the git push-option "ci.skip"

README.md

@@ -383,6 +383,7 @@ MOB_CLI_NAME="mob"
 MOB_REMOTE_NAME="origin"
 MOB_WIP_COMMIT_MESSAGE="mob next [ci-skip] [ci skip] [skip ci]"
 MOB_START_COMMIT_MESSAGE="mob start [ci-skip] [ci skip] [skip ci]"
+MOB_SKIP_CI_PUSH_OPTION_ENABLED=true
 MOB_GIT_HOOKS_ENABLED=false
 MOB_REQUIRE_COMMIT_MESSAGE=false
 MOB_VOICE_COMMAND="say \"%s\""

coauthors.go

@@ -3,7 +3,7 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"github.com/remotemobprogramming/mob/v4/say"
+	"github.com/remotemobprogramming/mob/v5/say"
 	"os"
 	"path"
 	"regexp"

configuration/configuration.go

@@ -2,7 +2,7 @@ package configuration
 
 import (
 	"bufio"
-	"github.com/remotemobprogramming/mob/v4/say"
+	"github.com/remotemobprogramming/mob/v5/say"
 	"os"
 	"runtime"
 	"strconv"

configuration/configuration_test.go

@@ -2,8 +2,8 @@ package configuration
 
 import (
 	"fmt"
-	"github.com/remotemobprogramming/mob/v4/say"
-	"github.com/remotemobprogramming/mob/v4/test"
+	"github.com/remotemobprogramming/mob/v5/say"
+	"github.com/remotemobprogramming/mob/v5/test"
 	"os"
 	"strings"
 	"testing"

go.mod

@@ -1,3 +1,3 @@
-module github.com/remotemobprogramming/mob/v4
+module github.com/remotemobprogramming/mob/v5
 
 go 1.22

goal/goal.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	config "github.com/remotemobprogramming/mob/v4/configuration"
-	"github.com/remotemobprogramming/mob/v4/httpclient"
-	"github.com/remotemobprogramming/mob/v4/say"
+	config "github.com/remotemobprogramming/mob/v5/configuration"
+	"github.com/remotemobprogramming/mob/v5/httpclient"
+	"github.com/remotemobprogramming/mob/v5/say"
 	"io"
 	"os"
 	"strings"

help/help.go

@@ -1,8 +1,8 @@
 package help
 
 import (
-	config "github.com/remotemobprogramming/mob/v4/configuration"
-	"github.com/remotemobprogramming/mob/v4/say"
+	config "github.com/remotemobprogramming/mob/v5/configuration"
+	"github.com/remotemobprogramming/mob/v5/say"
 )
 
 func Help(configuration config.Configuration) {

httpclient/httpclient.go

@@ -6,7 +6,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"github.com/remotemobprogramming/mob/v4/say"
+	"github.com/remotemobprogramming/mob/v5/say"
 	"io/ioutil"
 	"net/http"
 	"net/url"

mob.go

@@ -4,11 +4,11 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	config "github.com/remotemobprogramming/mob/v4/configuration"
-	"github.com/remotemobprogramming/mob/v4/goal"
-	"github.com/remotemobprogramming/mob/v4/help"
-	"github.com/remotemobprogramming/mob/v4/open"
-	"github.com/remotemobprogramming/mob/v4/say"
+	config "github.com/remotemobprogramming/mob/v5/configuration"
+	"github.com/remotemobprogramming/mob/v5/goal"
+	"github.com/remotemobprogramming/mob/v5/help"
+	"github.com/remotemobprogramming/mob/v5/open"
+	"github.com/remotemobprogramming/mob/v5/say"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	versionNumber     = "5.0.0"
+	versionNumber     = "5.0.1"
 	minimumGitVersion = "2.13.0"
 )
 
@@ -755,11 +755,10 @@ func startNewMobSession(configuration config.Configuration) {
 
 func gitPushArgs(c config.Configuration) []string {
 	pushArgs := []string{"push"}
-	if c.SkipCiPushOptionEnabled {
+	if !c.SkipCiPushOptionEnabled {
 		return pushArgs
-	} else {
-		return append(pushArgs, "--push-option", "ci.skip")
 	}
+	return append(pushArgs, "--push-option", "ci.skip")
 }
 
 func getUntrackedFiles() string {
@@ -1153,9 +1152,14 @@ func git(args ...string) {
 		if !isGit() {
 			say.Error("expecting the current working directory to be a git repository.")
 		} else {
-			say.Error(commandString)
-			say.Error(output)
-			say.Error(err.Error())
+			if strings.Contains(output, "does not support push options") {
+				say.Error("The receiving end does not support push options")
+				say.Fix("Disable the push option ci.skip in your .mob file or set the expected environment variable", "export MOB_SKIP_CI_PUSH_OPTION_ENABLED=false")
+			} else {
+				say.Error(commandString)
+				say.Error(output)
+				say.Error(err.Error())
+			}
 		}
 		Exit(1)
 	}