Fix 483 unable to checkout table(s)/branch(s) with same name by elianddb · Pull Request #9371 · dolthub/dolt

elianddb · 2025-06-18T16:16:14Z

Fixes: #483
Local/remote refs take priority in Do What I Mean (DWIM) scenarios where dolt has to interpret ambiguous input in checkout.
If a table and tracking branch share the same name, but local does not exist an error will occur.
-- can now be used to clear up ambiguity.
case 1: dolt checkout <ref> -- [<tables>]
<ref> must be a singular valid tree, everything else after '--' must be a table.
case 2: dolt checkout -- [<tables>]
This is case 1 but without <ref>.
case 3: git checkout <something> [--]
(a) If is a commit switch to branch.
(b) If isn’t a commit, and either "--" is present or isn’t a table, no -t or -b is given, and there’s a tracking branch named on exactly one remote (or on the specified remote), then this acts as shorthand to fork local from that remote-tracking branch.
(c) Otherwise, if "--" is present, treat it like case 1.
(d) Otherwise, if a ref treat it like case 1. If a table treat like case 2. If neither fail.
case 4: git checkout <something> <tables>
The first argument must not be ambiguous. If a <ref> follow case 1, if a table follow case 2. Otherwise, fail.

coffeegoddd · 2025-06-18T16:51:27Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`fecea6b`	ok	5937457

version	total_tests
`fecea6b`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T16:59:44Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`0631c39`	ok	5937457

version	total_tests
`0631c39`	5937457

correctness_percentage
100.0

elianddb · 2025-06-18T17:02:31Z

Extra issue I found though I didn't handle since they weren't relevant to this one:
On dolt checkout or dolt checkout -- the relationship between the current branch and its upstream (tracking) branch should be displayed, however, dolt currently displays the checkout usage message.

dolt checkout test0 test1 if test0 is not found it prevents test1 from being checkout in dolt but in git each is processed without affecting the other.

coffeegoddd · 2025-06-18T17:32:41Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`7587982`	ok	5937457

version	total_tests
`7587982`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T17:42:25Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`7282025`	ok	5937457

version	total_tests
`7282025`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T21:44:19Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`662b7a4`	ok	5937457

version	total_tests
`662b7a4`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T21:51:20Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`1d251bb`	ok	5937457

version	total_tests
`1d251bb`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T23:05:14Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`c919512`	ok	5937457

version	total_tests
`c919512`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-18T23:13:10Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`050269d`	ok	5937457

version	total_tests
`050269d`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T00:27:24Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`1c0a523`	ok	5937457

version	total_tests
`1c0a523`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T00:36:39Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`7f915f1`	ok	5937457

version	total_tests
`7f915f1`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T05:10:34Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`5b4d2f4`	ok	5937457

version	total_tests
`5b4d2f4`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T05:17:33Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`83507fd`	ok	5937457

version	total_tests
`83507fd`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T06:22:25Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`05b3bff`	ok	5937457

version	total_tests
`05b3bff`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-19T06:30:34Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`f2ec13f`	ok	5937457

version	total_tests
`f2ec13f`	5937457

correctness_percentage
100.0

zachmu

LGTM, see comments.

You should also add some spot checks to make sure these work in the SQL context for the dolt_checkout procedure. There's a dolt_queries.go file with lots of checkout tests in it.

go/libraries/doltcore/sqle/dprocedures/dolt_checkout.go

zachmu · 2025-06-20T19:36:37Z

integration-tests/bats/checkout.bats

+    dolt checkout main
+
+    # Use explicit branch reference
+    dolt checkout feature --


This answers my question from the code, didn't know about this syntax. Good to make that explicit in the code

zachmu · 2025-06-20T19:39:13Z

integration-tests/bats/checkout.bats

…lFileSystem()

…te.sh

coffeegoddd · 2025-06-25T15:50:54Z

@elianddb DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`cd81f2f`	ok	5937457

version	total_tests
`cd81f2f`	5937457

correctness_percentage
100.0

coffeegoddd · 2025-06-25T16:00:42Z

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
`852f652`	ok	5937457

version	total_tests
`852f652`	5937457

correctness_percentage
100.0

elianddb linked an issue Jun 18, 2025 that may be closed by this pull request

Unable to checkout table if branch name and table name are identical #483

Closed

coffeegoddd added the correctness_approved label Jun 18, 2025

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch from 0631c39 to 7587982 Compare June 18, 2025 17:00

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch 2 times, most recently from d2316fe to 662b7a4 Compare June 18, 2025 21:08

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch from 1d251bb to c919512 Compare June 18, 2025 22:31

elianddb self-assigned this Jun 18, 2025

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch 3 times, most recently from b1d1e9d to 1c0a523 Compare June 18, 2025 23:53

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch 2 times, most recently from 4518931 to 5b4d2f4 Compare June 19, 2025 04:36

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch from 83507fd to 05b3bff Compare June 19, 2025 05:49

zachmu approved these changes Jun 20, 2025

View reviewed changes

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch from f2ec13f to 72cbbbd Compare June 23, 2025 21:43

elianddb added 24 commits June 24, 2025 14:07

add implicit local branch checkout bats and rm DWIM prefix

f63c2e5

amend empty-repo check with new tablespec errout

3551bf1

fix <tag> [<tables>] scenario

d7c513d

fix remotes bats test

db81cea

fix non-regex cmp

6d03674

amend to mark valid remoteRefs >= 1

89c109c

rm branch deletion (branch never existed)

dc514c3

rm debug echo

7492650

add dolt queries test

215fa30

amend validate detached head func

0392dbd

rm use of ResetHard when firstArg = '.' to rm transaction implications

895fae3

amend rsc to ptr type

174b693

add test for multiple matching branch names

0a6ce28

rm isBranch check in checkout func for existing with fallback

631de00

fix err check and multi remote branch test

b244dfe

clarify existence bools

9fb02aa

rm loose string

98412e1

restore tablesFromHead func

554e12f

fix err msg on missing table(s)

16998d6

add local file system flag

53595f4

use file:/// for doltgres

71fa8d6

add ambiguity test inside of test func

b585448

add mkdir tmp

2786c2a

mv query test to dolt_queries.go, add conditional for harness UseLoca…

cd81f2f

…lFileSystem()

elianddb force-pushed the elianddb/fix-483-unable-to-checkout-table-branch branch from e69bc56 to cd81f2f Compare June 25, 2025 15:17

[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…

852f652

…te.sh

elianddb merged commit af8a3f7 into main Jun 25, 2025
21 of 22 checks passed

BrewTestBot mentioned this pull request Jun 26, 2025

dolt 1.55.3 Homebrew/homebrew-core#228192

Merged

Uh oh!

Conversation

elianddb commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

elianddb commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 18, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

coffeegoddd commented Jun 19, 2025

Uh oh!

zachmu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zachmu Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

zachmu Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

coffeegoddd commented Jun 25, 2025

Uh oh!

coffeegoddd commented Jun 25, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

elianddb commented Jun 18, 2025 •

edited

Loading