Tell user how to rebase #183
Merged
Conversation
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
Some patches do not modify an existing file in place. Instead they add, remove, or rename a file. This is a "non-modified patch", and will commute with everything in the stack. If all patches are non-modified, then no changes will be absorbed, so warn the user and stop processing. Even users that auto-stage changes will be warned, since they would've run git-absorb with the expectation that it would do something. Otherwise, if only some patches are non-modified, we can continue processing with a warning. In this case, do not warn users who auto-stage changes, since they may routinely keep untracked files in their working directory. Before this, 1. users who did not auto-stage were warned when nothing was staged. We have a more explicit warning and early exit above now. 2. there were staged changes (auto-staged or not) and all the patches were non-modified, we'd warn "Could not find a commit to fix up", which is accurate, but not as informative.
Contributor
Author
|
I'm not trying to compete with #180, but decided to show the PR for consideration, as it presents an alternative way to provide the information to the user (indicating what can be done with the base, rather than just saying what it is; users who don't use I'm happy to withdraw in favour of #180. @arielf212, if any of the bits are useful, please take them. |
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.
Closes #133.
Builds on #182. Only the most recent commit is relevant here.
I'd had this in-flight as part of #182, but split out when I saw #180.