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

Avoid integer divide by zero (backport #1750) #1753

Merged
merged 3 commits into from
Jul 1, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

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

On branch mergify/bp/main/pr-1750
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a789ca3d.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-1750 branch from f1f77e2 to 66fc7c7 Compare July 1, 2021 11:46
@codecov
Copy link

codecov bot commented Jul 1, 2021

Codecov Report

Merging #1753 (66fc7c7) into main (8c4d67c) will increase coverage by 0.14%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1753      +/-   ##
==========================================
+ Coverage   66.94%   67.08%   +0.14%     
==========================================
  Files         151      151              
  Lines       20794    20789       -5     
==========================================
+ Hits        13920    13946      +26     
+ Misses       6874     6843      -31     
Impacted Files Coverage Δ
include/exiv2/value.hpp 92.50% <100.00%> (+1.87%) ⬆️
src/minoltamn_int.cpp 59.13% <100.00%> (+5.62%) ⬆️
src/tags_int.cpp 87.20% <100.00%> (ø)
src/sonymn_int.cpp 89.47% <0.00%> (+33.91%) ⬆️

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 8c4d67c...66fc7c7. Read the comment docs.

Copy link
Member

@hassec hassec left a comment

Choose a reason for hiding this comment

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

Thanks @kevinbackhouse 👍

@hassec hassec merged commit 5ab3f2b into main Jul 1, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1750 branch July 1, 2021 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants