add --single-branch flag for dolt clone
#7088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
macneale4
requested changes
Dec 2, 2023
| if brnch.GetPath() != branch { | ||
| err := dEnv.DoltDB.DeleteBranch(ctx, brnch, nil) | ||
| if err != nil { | ||
| return fmt.Errorf("%w: %s; %s", ErrFailedToDeleteBranch, brnch.String(), err.Error()) | ||
| } | ||
| } else if !singleBranch || brnch.GetPath() == branch { |
There was a problem hiding this comment.
The only way you can reach this conditional is if the branches are equal (because we checked for inequality in the first conditional), so this block will always be entered regardless of the singleBranch flag, because anything || TRUE is always true.
You can convince me this is right if you can point me to tests which verify the remote tracking branches work without the --single-branch (or write a test for that if we don't have one).
macneale4
approved these changes
Dec 5, 2023
| if err != nil { | ||
| return fmt.Errorf("%w: %s; %s", ErrFailedToResolveBranchRef, brnch.String(), err.Error()) | ||
| for _, br := range branches { | ||
| if !singleBranch || (singleBranch && br.GetPath() == branch) { |
There was a problem hiding this comment.
small logical redundancy we talked about.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds
--single-branchflag fordolt cloneto match git behavior more closely.Fixes: #3873