Merge pull request #367 from remotemobprogramming/mob-done-merge-bug

#358 fixed printing git merge just once in mob done

Author: hollesse

mob.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	versionNumber     = "4.3.0"
+	versionNumber     = "4.3.1"
 	minimumGitVersion = "2.13.0"
 )
 
@@ -1404,8 +1404,6 @@ func gitIgnoreFailure(args ...string) error {
 		commandString, output, err = runCommandSilent("git", args...)
 	}
 
-	say.Indented(commandString)
-
 	if err != nil {
 		if !isGit() {
 			say.Error("expecting the current working directory to be a git repository.")

mob_test.go

@@ -918,6 +918,19 @@ func TestStartDoneWithMobDoneSquash(t *testing.T) {
 	assertNoMobSessionBranches(t, configuration, "mob-session")
 }
 
+func TestStartDoneWithMobDoneBugMergeTwice(t *testing.T) {
+	output, configuration := setup(t)
+
+	start(configuration)
+	assertOnBranch(t, "mob-session")
+
+	done(configuration)
+
+	assertOnBranch(t, "master")
+	assertNoMobSessionBranches(t, configuration, "mob-session")
+	assertOutputNotContains(t, output, "git merge --squash --ff mob-session\n  git merge --squash --ff mob-session\n")
+}
+
 func TestStartDoneSquashWithUnpushedCommit(t *testing.T) {
 	_, configuration := setup(t)
 	configuration.DoneSquash = config.Squash