Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix new --after ignoring immutable commits + update hint for root commit being immutable #2468

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Fix new --after ignoring immutable commits + update hint for root commit being immutable #2468

merged 2 commits into from
Oct 30, 2023

Conversation

ilyagr
Copy link
Collaborator

@ilyagr ilyagr commented Oct 30, 2023

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • (n/a) I have updated the documentation (README.md, docs/, demos/)
  • (n/a) I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@ilyagr ilyagr marked this pull request as ready for review October 30, 2023 03:24
@ilyagr ilyagr marked this pull request as draft October 30, 2023 03:33
ilyagr added 2 commits October 29, 2023 20:35
@ilyagr
cli new: have --before/--after respect immutable commits
b2f2995 
I wasn't very careful to make the function
pretty; I'm planning to refactor it anyway as
part of implementing `rebase --before` and
`rebase --after`.
@ilyagr
immutable commits: remove the hint if trying to edit the root commit
2190aee 
The hint is a bit misleading in this case. I also changed the message slightly.
@ilyagr ilyagr marked this pull request as ready for review October 30, 2023 03:35
martinvonz
martinvonz approved these changes Oct 30, 2023
View reviewed changes
Copy link
Owner

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing! Sorry I missed it when I added support for immutable commits. I had actually forgotten we had these flags.

cli/tests/test_new_command.rs Outdated Show resolved Hide resolved
@ilyagr ilyagr merged commit b482898 into martinvonz:main Oct 30, 2023
14 checks passed
@ilyagr ilyagr deleted the newimm branch October 30, 2023 04:13
@p-linnane p-linnane mentioned this pull request Nov 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ilyagr @martinvonz