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

Replace assertion with an error message (backport #1848) #1849

Merged
merged 1 commit into from
Aug 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2021

This is an automatic backport of pull request #1848 done by Mergify.
Cherry-pick of e33a2be has failed:

On branch mergify/bp/main/pr-1848
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit e33a2bee.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   test/data/issue_1847_poc.jpg
	new file:   tests/bugfixes/github/test_issue_1847.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tiffcomposite_int.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@codecov
Copy link

codecov bot commented Aug 5, 2021

Codecov Report

Merging #1849 (9e160a4) into main (cca3e07) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1849      +/-   ##
==========================================
- Coverage   60.62%   60.61%   -0.01%     
==========================================
  Files          96       96              
  Lines       18873    18874       +1     
  Branches     9487     9488       +1     
==========================================
  Hits        11441    11441              
- Misses       5144     5145       +1     
  Partials     2288     2288              
Impacted Files Coverage Δ
src/tiffcomposite_int.cpp 73.85% <0.00%> (-0.08%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cca3e07...9e160a4. Read the comment docs.

@kevinbackhouse kevinbackhouse merged commit a1b65a7 into main Aug 6, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1848 branch August 6, 2021 12:47
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