Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow different format options for dolt branch with track flag #5286

Merged
merged 2 commits into from
Feb 3, 2023

Conversation

jennifersp
Copy link
Contributor

@jennifersp jennifersp commented Feb 2, 2023

Git allows:
git branch feature --track origin/feature
git branch --track request origin/feature
git branch feature --track=direct origin/feature
git branch --track=direct feature origin/feature
for creating new branch that tracks given remote tracking branch

does not allow:
git branch feature --track direct origin/feature, but Dolt allows it as --track direct and --track=direct are considered the same

@jennifersp jennifersp linked an issue Feb 2, 2023 that may be closed by this pull request
Copy link
Contributor

@fulghum fulghum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code change looks fine, just a couple of notes to make sure we have enough test coverage.

Could you also take a look at the SQL path for dolt_branch and see if we need to update anything there to have the same functionality and test coverage?

integration-tests/bats/remotes.bats Outdated Show resolved Hide resolved
integration-tests/bats/remotes.bats Show resolved Hide resolved
Copy link
Contributor

@fulghum fulghum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Assuming all those CI tests pass, this looks good to go! 🙌

@jennifersp jennifersp merged commit 257b6b2 into main Feb 3, 2023
@jennifersp jennifersp deleted the jennifer/track branch February 3, 2023 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dolt branch --track does not create a new branch
2 participants