feat: Use remote tracking branch if it's trunk #100
Conversation
Current Aviator status
This PR was merged using Aviator. |
draftcode
force-pushed
the
reparent_upstream
branch
from
e549644
to
9000130
Compare
| parentSha, err := repo.RevParse(&git.RevParse{Rev: opts.NewParent}) | ||
| parentBranch := opts.NewParent | ||
| if opts.NewParentTrunk { | ||
| parentBranch = "remotes/origin/" + opts.NewParent |
There was a problem hiding this comment.
I'm not sure that this is what we want by default. It will be surprising to people that don't use the "no local main branch" workflow. Requiring users to pass origin/main explicitly will probably be better.
There was a problem hiding this comment.
Actually I think I changed my mind on this. Assuming you always want to update on the latest version of trunk is probably reasonable. We can always add a --no-fetch type flag if anyone ever needs that.
| parentSha, err := repo.RevParse(&git.RevParse{Rev: opts.NewParent}) | ||
| parentBranch := opts.NewParent | ||
| if opts.NewParentTrunk { | ||
| parentBranch = "remotes/origin/" + opts.NewParent |
There was a problem hiding this comment.
Actually I think I changed my mind on this. Assuming you always want to update on the latest version of trunk is probably reasonable. We can always add a --no-fetch type flag if anyone ever needs that.
draftcode
force-pushed
the
reparent_upstream
branch
from
9000130
to
b1ba753
Compare
No description provided.