Repository navigation
Rebase: Support "fixup -C" todo lines - #172
Merged
Merged
Conversation
With rebase.autoSquash, git turns an "amend!" commit into a "fixup -C" todo line. The todo parser rejected it, so the interactive rebase didn't start. Add RebaseOp.FixupC, which melds like a fixup. RebaseDialog doesn't offer it in its menu yet. Fixes jorio#167
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
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.
Fixes #167. With
rebase.autoSquash, git turns anamend!commit into afixup -Ctodo line, and the todo parser rejected it, so the interactive rebase didn't start.This adds
RebaseOp.FixupCas you described: it melds like a fixup, uses the fixup color, and has your description in trtables.py. It isn't inSupportedRebaseOps, so RebaseDialog's menu doesn't offer it. It has no hotkey letter either, and looking it up inRebaseOpLettersfor a cramped pill in the graph raised KeyError, so cramped pills now fall back to the op's first letter.testRebaseAmendCommitWithAutoSquashruns the rebase from the issue end to end and fails on master.testRebasePillCrampedFixupCcovers the cramped pill. Linux: 1018 passed, 20 skipped (PyQt6);test_tasks_rebase.pyandtest_gitfourchette.pyalso pass on PySide6.Prepared with Claude Code; I reviewed the changes.