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

Check that the iterator is not end() after calling findKey (backport #1758) #1761

Merged
merged 3 commits into from
Jul 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 5, 2021

This is an automatic backport of pull request #1758 done by Mergify.
Cherry-pick of 18d1689 has failed:

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

You are currently cherry-picking commit 18d16895.
  (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/pentaxmn_int.cpp

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

Cherry-pick of 3ac426b has failed:

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

You are currently cherry-picking commit 3ac426b2.
  (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:
	modified:   src/crwimage_int.cpp
	modified:   src/exif.cpp
	modified:   src/iptc.cpp
	modified:   src/xmp.cpp

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

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/

@codecov
Copy link

codecov bot commented Jul 5, 2021

Codecov Report

Merging #1761 (b457bb3) into main (d30c95d) will increase coverage by 0.06%.
The diff coverage is 97.36%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1761      +/-   ##
==========================================
+ Coverage   67.22%   67.29%   +0.06%     
==========================================
  Files         151      151              
  Lines       20787    20797      +10     
==========================================
+ Hits        13975    13995      +20     
+ Misses       6812     6802      -10     
Impacted Files Coverage Δ
src/convert.cpp 69.32% <92.30%> (+0.11%) ⬆️
src/crwimage_int.cpp 87.16% <100.00%> (+0.12%) ⬆️
src/exif.cpp 76.10% <100.00%> (ø)
src/iptc.cpp 76.05% <100.00%> (ø)
src/pentaxmn_int.cpp 83.94% <100.00%> (+1.23%) ⬆️
src/xmp.cpp 90.55% <100.00%> (ø)
src/tiffcomposite_int.cpp 83.12% <0.00%> (+0.90%) ⬆️

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 d30c95d...b457bb3. Read the comment docs.

@hassec hassec merged commit c2b5211 into main Jul 5, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1758 branch July 5, 2021 20:26
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