fix(rebase): Run --exec commands also if the stack base does not change#639
Merged
jpgrayson merged 1 commit intoJun 22, 2026
Conversation
mriemensberger
force-pushed
the
638-rebase-base-exec-executes-commands
branch
from
088a99c to
09ef0fa
Compare
`stg rebase --exec` is modeled after `git rebase --exec`. However,
`stg rebase --exec cmd {base}` short-circuits the rebase entirely since
the stack base does not change. This diverges from `git rebase`
behavior which execute commands in a similar scenario
`git rebase --onto $(stg id {base}) $(stg id {base}) mybranch`. Make
stgit behave like git by removing the short-ciruiting if `--exec` is
specified.
Fixes: stacked-git#638
Signed-off-by: Maximilian Riemensberger <riemensberger@cadami.net>
mriemensberger
force-pushed
the
638-rebase-base-exec-executes-commands
branch
from
09ef0fa to
ac3316e
Compare
Collaborator
|
Thank you for this contribution, @mriemensberger. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
stg rebase --execis modeled aftergit rebase --exec. However,stg rebase --exec cmd {base}short-circuits the rebase entirely since the stack base does not change. This diverges fromgit rebasebehavior which execute commands in a similar scenariogit rebase --onto $(stg id {base}) $(stg id {base}) mybranch. Make stgit behave like git by removing the short-ciruiting if--execis specified.Fixes: #638