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

bufRead needs to be adjusted after seek() (backport #1790) #1799

Merged
merged 9 commits into from
Jul 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 26, 2021

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

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

You are currently cherry-picking commit b3c63dac.
  (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:   test/data/icc-test.out
	modified:   tests/bugfixes/redmine/test_issue_1247.py

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

Cherry-pick of b5cbb47 has failed:

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

You are currently cherry-picking commit b5cbb479.
  (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/jpgimage.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://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/

@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-1790 branch from 16d989b to 2532f6d Compare July 26, 2021 11:51
@codecov
Copy link

codecov bot commented Jul 26, 2021

Codecov Report

Merging #1799 (35a2b25) into main (01b109e) will increase coverage by 0.22%.
The diff coverage is 84.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1799      +/-   ##
==========================================
+ Coverage   67.63%   67.86%   +0.22%     
==========================================
  Files         151      151              
  Lines       20903    20847      -56     
==========================================
+ Hits        14138    14147       +9     
+ Misses       6765     6700      -65     
Impacted Files Coverage Δ
src/jpgimage.cpp 86.36% <84.53%> (+8.12%) ⬆️
src/image.cpp 72.74% <0.00%> (-0.24%) ⬇️
src/actions.cpp 74.40% <0.00%> (+0.02%) ⬆️

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 01b109e...35a2b25. Read the comment docs.

@kevinbackhouse kevinbackhouse merged commit c486999 into main Jul 26, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1790 branch July 26, 2021 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants