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

apply: Reject empty commits without --allow-empty #243

Merged
merged 2 commits into from
Sep 7, 2020
Merged

Conversation

craigds
Copy link
Member

@craigds craigds commented Sep 7, 2020

Description

Patches can be non-empty and still result in an empty commit.
In that case apply was just creating an empty commit.
This fixes it to only create an empty commit with the --allow-empty
option; otherwise it exits with code 44.

Related links:

none

Checklist:

  • Have you reviewed your own change?
  • Have you included test(s)?
  • Have you updated the changelog?

Patches can be non-empty and still result in an empty commit.
In that case `apply` was just creating an empty commit.
This fixes it to only create an empty commit with the `--allow-empty`
option; otherwise it exits with code 44.
@craigds craigds merged commit d20f96c into master Sep 7, 2020
@craigds craigds deleted the no-empty-patches branch September 7, 2020 22:24
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.

2 participants