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.

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

Refuse to split an empty commit with jj split. #3663

Merged
merged 1 commit into from
May 10, 2024

Conversation

aspotashev
Copy link
Collaborator

@aspotashev aspotashev commented May 10, 2024

Rationale: The user may be confused by the empty diff in the diff editor tool if they accidentally run jj split on a wrong (empty) commit.

Checklist

If applicable:

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

@aspotashev aspotashev requested a review from martinvonz May 10, 2024 14:57
@aspotashev aspotashev force-pushed the aspotashev/split-empty branch from 177b763 to c6a279f Compare May 10, 2024 15:00
@martinvonz
Copy link
Member

No need to assign a reviewer. Someone usually picks it up pretty quickly. In particular, you can't pick me as a reviewer since we work for the same company (see https://martinvonz.github.io/jj/v0.17.1/contributing/) :)

@martinvonz martinvonz removed their request for review May 10, 2024 15:11
Rationale: The user may be confused by the empty diff in the diff editor
tool if they accidentally run `jj split` on a wrong (empty) commit.
@aspotashev aspotashev force-pushed the aspotashev/split-empty branch from c6a279f to 7ac3292 Compare May 10, 2024 15:46
Copy link
Collaborator

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

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

LG

@aspotashev aspotashev merged commit 07559f2 into main May 10, 2024
16 checks passed
@aspotashev aspotashev deleted the aspotashev/split-empty branch May 10, 2024 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants