done pulls if already done

Co-authored-by: Dario Zanotto <[email protected]> Co-authored-by: Martin Sereinig <[email protected]> Co-authored-by: Harald Reingruber <[email protected]> Co-authored-by: Michael Weichselbaumer <[email protected]> Co-authored-by: Ricardo Colombo <[email protected]> Co-authored-by: Bernadette Hammerle <[email protected]>
remotemobprogramming · Sep 20, 2024 · c49eda0 · c49eda0
1 parent d292a91
commit c49eda0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/mob.go b/mob.go
@@ -971,6 +971,7 @@ func done(configuration config.Configuration) {
 	} else {
 		git("checkout", baseBranch.Name)
 		git("branch", "-D", wipBranch.Name)
+		git("pull", "--ff-only")
 		say.Info("someone else already ended your session")
 	}
 }

diff --git a/mob_test.go b/mob_test.go
@@ -1695,6 +1695,27 @@ func TestDoneSquashWipStartCommit(t *testing.T) {
 	assertCommitsOnBranch(t, 1, "master")
 }
 
+func TestDonePullsIfAlreadyDone(t *testing.T) {
+	_, configuration := setup(t)
+	configuration.NextStay = true
+
+	setWorkingDir(tempDir + "/bob")
+	start(configuration)
+	createFile(t, "example.txt", "contentIrrelevant")
+	next(configuration)
+
+	setWorkingDir(tempDir + "/alice")
+	start(configuration)
+	done(configuration)
+	git("commit", "-am", "\"mob done by Alice\"")
+	git("push")
+
+	setWorkingDir(tempDir + "/bob")
+	done(configuration)
+
+	assertFileExist(t, "example.txt")
+}
+
 func TestDoneNoSquashStartCommit(t *testing.T) {
 	_, configuration := setup(t)
 	configuration.NextStay = true