From 4d98a052c81f8e410946f470e96b6cafc916437c Mon Sep 17 00:00:00 2001
From: Zach Musgrave <zach@dolthub.com>
Date: Sun, 19 May 2024 15:05:38 -0700
Subject: [PATCH 1/3] Attempt to repro bug, nothing yet

---
 integration-tests/bats/sql-pull.bats | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/integration-tests/bats/sql-pull.bats b/integration-tests/bats/sql-pull.bats
index 69c6a7370e..d7184b5053 100644
--- a/integration-tests/bats/sql-pull.bats
+++ b/integration-tests/bats/sql-pull.bats
@@ -406,3 +406,34 @@ SQL
     [[ "$output" =~ "merge from origin" ]] || false
 }
 
+@test "sql-pull: pull two different branches same session" {
+    cd repo2
+    dolt pull
+    
+    dolt sql <<SQL
+    insert into t1 values (1,1), (2,2);
+    call dolt_commit('-Am', 'new rows in t1');
+    call dolt_branch('b1');
+    call dolt_checkout('b1');
+    insert into t1 values (3,3);
+    call dolt_commit('-Am', 'new row on b1');
+SQL
+
+    dolt push origin main
+    dolt checkout b1
+    dolt push origin b1
+    dolt checkout main
+
+    cd ../repo1
+    
+    dolt sql <<SQL
+    set autocommit = 0;
+    call dolt_checkout('main');
+    call dolt_pull('origin', 'main');
+    call dolt_checkout('b1');
+    call dolt_pull('origin', 'b1');
+    call dolt_branch('b2', 'main'); -- implicitly commits
+SQL
+    
+}
+

From 935e7654c4a2af8d9550a21422cc65b418905f8d Mon Sep 17 00:00:00 2001
From: Zach Musgrave <zach@dolthub.com>
Date: Sun, 19 May 2024 17:13:29 -0700
Subject: [PATCH 2/3] Repro for bad pull behavior when already up to date

---
 integration-tests/bats/sql-pull.bats | 74 ++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 5 deletions(-)

diff --git a/integration-tests/bats/sql-pull.bats b/integration-tests/bats/sql-pull.bats
index d7184b5053..662ba9b9bd 100644
--- a/integration-tests/bats/sql-pull.bats
+++ b/integration-tests/bats/sql-pull.bats
@@ -406,15 +406,15 @@ SQL
     [[ "$output" =~ "merge from origin" ]] || false
 }
 
-@test "sql-pull: pull two different branches same session" {
+@test "sql-pull: pull two different branches in the same session" {
     cd repo2
     dolt pull
     
     dolt sql <<SQL
+    call dolt_checkout('main');
     insert into t1 values (1,1), (2,2);
     call dolt_commit('-Am', 'new rows in t1');
-    call dolt_branch('b1');
-    call dolt_checkout('b1');
+    call dolt_checkout('-b', 'b1');
     insert into t1 values (3,3);
     call dolt_commit('-Am', 'new row on b1');
 SQL
@@ -425,15 +425,79 @@ SQL
     dolt checkout main
 
     cd ../repo1
+    dolt pull origin main
+    dolt checkout b1
+    dolt pull origin b1
+
+    cd ../repo2
+    dolt sql <<SQL
+    call dolt_checkout('main');
+    insert into t1 values (4,4);
+    call dolt_commit('-Am', 'new row in t1');
+    call dolt_checkout('b1');
+    insert into t1 values (5,5);
+    call dolt_commit('-Am', 'new row on b1');
+SQL
+
+    dolt push origin main
+    dolt checkout b1
+    dolt push origin b1
+    dolt checkout main
     
+    cd ../repo1
+
+    dolt sql <<SQL
+    call dolt_checkout('main');
+    insert into t1 values (6,6);
+    call dolt_commit('-Am', 'new row in t1');
+    call dolt_checkout('b1');
+    insert into t1 values (7,7);
+    call dolt_commit('-Am', 'new row on b1');
+SQL
+
+    # Now pull from both branches and make sure we can commit the result in a single tx
     dolt sql <<SQL
     set autocommit = 0;
     call dolt_checkout('main');
     call dolt_pull('origin', 'main');
     call dolt_checkout('b1');
     call dolt_pull('origin', 'b1');
-    call dolt_branch('b2', 'main'); -- implicitly commits
+    commit;
 SQL
-    
 }
 
+@test "sql-pull: pull two different branches same session, already up to date" {
+    cd repo2
+    dolt pull
+    
+    dolt sql <<SQL
+    call dolt_checkout('main');
+    insert into t1 values (1,1), (2,2);
+    call dolt_commit('-Am', 'new rows in t1');
+    call dolt_checkout('-b', 'b1');
+    insert into t1 values (3,3);
+    call dolt_commit('-Am', 'new row on b1');
+SQL
+
+    dolt push origin main
+    dolt checkout b1
+    dolt push origin b1
+    dolt checkout main
+
+    cd ../repo1
+    dolt pull origin main
+    dolt checkout b1
+    dolt pull origin b1
+
+    # Make sure we can commit the result after a no-op pull on two branches
+    dolt sql <<SQL
+    set autocommit=off;
+    call dolt_checkout('main');
+    call dolt_pull('origin', 'main');
+    call dolt_checkout('b1');
+    call dolt_pull('origin', 'b1');
+    commit;
+SQL
+}
+
+

From f28be4cf2ceed4bce7ff969fd2b1184ff9f1e51c Mon Sep 17 00:00:00 2001
From: Zach Musgrave <zach@dolthub.com>
Date: Mon, 20 May 2024 18:04:20 -0700
Subject: [PATCH 3/3] Bug fix for pull leaving working set dirty when it's
 already up to date

---
 go/libraries/doltcore/sqle/dprocedures/dolt_pull.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go b/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go
index 47dd51ded5..5ef20e7e37 100644
--- a/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go
+++ b/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go
@@ -204,11 +204,6 @@ func doDoltPull(ctx *sql.Context, args []string) (int, int, string, error) {
 			if err != nil && !errors.Is(doltdb.ErrUpToDate, err) {
 				return conflicts, fastForward, "", err
 			}
-
-			err = sess.SetWorkingSet(ctx, dbName, ws)
-			if err != nil {
-				return conflicts, fastForward, "", err
-			}
 		}
 		if !rsSeen {
 			return noConflictsOrViolations, threeWayMerge, "", fmt.Errorf("%w: '%s'", ref.ErrInvalidRefSpec, refSpec.GetRemRefToLocal())