git sync --pull will rebase my current stack onto the new main, and checkout to the corresponding commit on the new stack.
However, if my current repo has uncommitted changes, the step "checkout" may fail.
Despite that git sync --pull fails in the last step, the stack is still rebased, and the old commits were rewritten to the new stack.
At this moment, the correct user action, is for them to address the checkout failure (e.g. with a stash), and manually checkout to the new stack. Otherwise they are left at a rewritten commit in the old stack. I think this could be confusing. For instance, today one user thought "sync failed, so I'll remove my uncommitted changes and sync again", and they ended up with two identical stacks.
Expected behavior
I wonder what could make the experience more straightforward in the above scenario, e.g.:
Maybe sync --pull can revert to the initial state, if the last checkout failed.
Maybe sync --pull can refuse to run, if it founds the current commit needs to be rewritten AND the current repo has uncommitted changes.
Description of the bug
git sync --pullwill rebase my current stack onto the newmain, and checkout to the corresponding commit on the new stack.However, if my current repo has uncommitted changes, the step "checkout" may fail.
Despite that
git sync --pullfails in the last step, the stack is still rebased, and the old commits were rewritten to the new stack.At this moment, the correct user action, is for them to address the checkout failure (e.g. with a stash), and manually checkout to the new stack. Otherwise they are left at a rewritten commit in the old stack. I think this could be confusing. For instance, today one user thought "sync failed, so I'll remove my uncommitted changes and sync again", and they ended up with two identical stacks.
Expected behavior
I wonder what could make the experience more straightforward in the above scenario, e.g.:
sync --pullcan revert to the initial state, if the last checkout failed.sync --pullcan refuse to run, if it founds the current commit needs to be rewritten AND the current repo has uncommitted changes.Actual behavior
No response
Version of
rustcNo response
Automated bug report
No response
Version of
git-branchlessgit-branchless-opts 0.8.0
Version of
gitgit version 2.25.1