Implement but branch new stacked branch #10477
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
When doing `but branch new <branchname>` you can also pass `--anchor <branch|commit>` or `-a <branch|commit>` to create a stacked branch
krlvi
force-pushed
the
kv-branch-58
branch
2 times, most recently
from
7fadd50 to
71902aa
Compare
| Ok(()) | ||
| } else { | ||
| // Create an independent branch | ||
| let req = gitbutler_branch::BranchCreateRequest { |
There was a problem hiding this comment.
That's interesting, I thought but_api::create_branch() does the same, but using the new API.
That's what the UI calls.
There was a problem hiding this comment.
Nice catch. This commit only had the but_api::virtual_branches::create_virtual_branch so here I only added the create reference. But this should be updated indeed
There was a problem hiding this comment.
Hmm the frontend still does the create_virtual_branch command so this just does the same
Maybe it should be updated in both places....
There was a problem hiding this comment.
Ah, right, I was confused. Somehow I thought there would only be one function for that, but in fact there are two, this one and the one I mentioned, and both are used by the UI for some reason :). Both support ws3 and will call the respective new function, so there is no issue with it - probably this one has better
This is probably where one would apply another fix then.
I also think what I was responding to here is to generally avoid calling anything with virtual in it 😅.
There was a problem hiding this comment.
I opened #10492 for this, with the kind request to validate it as I didn't do that
2 participants
When doing
but branch new <branchname>you can also pass
--anchor <branch|commit>or-a <branch|commit>tocreate a stacked branch