mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2025-12-30 16:12:39 -06:00
Code Issues Packages Projects Releases 114 Wiki Activity

Merge pull request #7882 from dolthub/zachmu/pull-bug

Browse Source 
Bug fix: no-op `dolt_pull()` was leaving working set dirty
This commit is contained in:
Zach Musgrave
2024-05-21 13:44:56 -07:00
committed by GitHub
parent 9165f6b24e f28be4cf2c
commit 4cd8fb70f5
2 changed files with 95 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
go/libraries/doltcore/sqle/dprocedures/dolt_pull.go
View File

@@ -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())

95
integration-tests/bats/sql-pull.bats
View File

@@ -406,3 +406,98 @@ SQL
[[ "$output" =~ "merge from origin" ]] || false
}
@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_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
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');
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
}