split: do not prevent all changes from going into the parent commit, and a fix #4542
Conversation
This file contains 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
samueltardieu
force-pushed
the
split-all-changes-interactively
branch
from
cc8d65c
to
b5fc7e3
Compare
|
Should most of the PR description be moved into the commit description (with s/PR/commit/ or similar)? The question makes sense in the PR description. |
samueltardieu
force-pushed
the
split-all-changes-interactively
branch
from
b5fc7e3
to
f5abd6d
Compare
It even led me to split the commits (using |
samueltardieu
changed the title
samueltardieu
force-pushed
the
split-all-changes-interactively
branch
2 times, most recently
from
30a0235
to
a50cecd
Compare
martinvonz
approved these changes
Sep 27, 2024
jj split warning was potentially wrong in both interactive and non-interactive modes when everything is put into the child commit: - Non-interactive mode: "The given paths does not match any file: PATHS". The message is misleading, as the PATHS given on the command-line may match files but not match files containing changes. - Interactive mode: "The given paths does not match any file: " while if possible that no paths were given on the command line.
Let the user select all changes interactively and put them into the first commit, and create a second commit with the possibility of preserving the current commit message. This was previously only possible in non-interactive mode by specifying matching paths, e.g. ".". In both cases, a warning will be issued indicating that the second commit is empty.
samueltardieu
force-pushed
the
split-all-changes-interactively
branch
from
a50cecd
to
1cbec40
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allowing to put everything into the first commit closes #4533.
Question: should we suggest using
jj undoif everything was put into one of the two commits in case the user didn't want to do this? Or, do we want this only if, in addition, the empty commit has an empty description, because there should be no reason to create an empty commit?Checklist
If applicable:
CHANGELOG.md