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

[release-4.15] OCPBUGS-27792,OCPBUGS-27796: [Upstream]: <carry>: Update go-git to v5.11.0 #70

Merged
merged 1 commit into from Jan 30, 2024

Conversation

kevinrizza
Copy link
Member

Resolves OCPBUGS-27792, OCPBUGS-27796

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 30, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-27792, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

The bug has been updated to refer to the pull request using the external bug tracker.

This pull request references Jira Issue OCPBUGS-27796, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Resolves OCPBUGS-27792, OCPBUGS-27796

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from kuiwang02 January 30, 2024 16:32
@ncdc
Copy link
Contributor

ncdc commented Jan 30, 2024

/lgtm
/approve
/label backport-risk-assessed
/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. labels Jan 30, 2024
@openshift-ci openshift-ci bot requested review from m1kola and tmshort January 30, 2024 16:38
Copy link
Contributor

openshift-ci bot commented Jan 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza, ncdc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Jan 30, 2024
@ncdc
Copy link
Contributor

ncdc commented Jan 30, 2024

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 664e875 and 2 for PR HEAD 9072ff2 in total

Resolves OCPBUGS-27792, OCPBUGS-27796

Signed-off-by: kevinrizza <krizza@redhat.com>
@ncdc
Copy link
Contributor

ncdc commented Jan 30, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2024
@kevinrizza
Copy link
Member Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@kevinrizza: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Contributor

openshift-ci bot commented Jan 30, 2024

@kevinrizza: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 977882d into openshift:main Jan 30, 2024
9 checks passed
@openshift-ci-robot
Copy link

@kevinrizza: Jira Issue OCPBUGS-27792: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-27792 has not been moved to the MODIFIED state.

Jira Issue OCPBUGS-27796: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-27796 has not been moved to the MODIFIED state.

In response to this:

Resolves OCPBUGS-27792, OCPBUGS-27796

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

@kevinrizza: #70 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: <carry>: Update go-git to v5.11.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/github.com/acomagu/bufpipe/CREDITS
A	vendor/github.com/acomagu/bufpipe/LICENSE
M	vendor/github.com/acomagu/bufpipe/README.md
M	vendor/github.com/acomagu/bufpipe/bufpipe.go
M	vendor/github.com/go-git/go-git/v5/.gitignore
M	vendor/github.com/go-git/go-git/v5/COMPATIBILITY.md
M	vendor/github.com/go-git/go-git/v5/Makefile
M	vendor/github.com/go-git/go-git/v5/config/branch.go
M	vendor/github.com/go-git/go-git/v5/config/config.go
M	vendor/github.com/go-git/go-git/v5/options.go
M	vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/diff_delta.go
M	vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/parser.go
M	vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/patch_delta.go
A	vendor/github.com/go-git/go-git/v5/plumbing/hash/hash.go
M	vendor/github.com/go-git/go-git/v5/plumbing/object/commit.go
M	vendor/github.com/go-git/go-git/v5/plumbing/object/patch.go
M	vendor/github.com/go-git/go-git/v5/plumbing/protocol/packp/common.go
M	vendor/github.com/go-git/go-git/v5/plumbing/protocol/packp/srvresp.go
M	vendor/github.com/go-git/go-git/v5/plumbing/reference.go
M	vendor/github.com/go-git/go-git/v5/plumbing/storer/object.go
M	vendor/github.com/go-git/go-git/v5/plumbing/transport/common.go
M	vendor/github.com/go-git/go-git/v5/plumbing/transport/git/common.go
M	vendor/github.com/go-git/go-git/v5/plumbing/transport/internal/common/common.go
M	vendor/github.com/go-git/go-git/v5/plumbing/transport/server/server.go
M	vendor/github.com/go-git/go-git/v5/plumbing/transport/ssh/common.go
M	vendor/github.com/go-git/go-git/v5/remote.go
M	vendor/github.com/go-git/go-git/v5/repository.go
M	vendor/github.com/go-git/go-git/v5/storage/filesystem/dotgit/dotgit.go
M	vendor/github.com/go-git/go-git/v5/storage/filesystem/object.go
M	vendor/github.com/go-git/go-git/v5/storage/filesystem/storage.go
M	vendor/github.com/go-git/go-git/v5/storage/memory/storage.go
M	vendor/github.com/go-git/go-git/v5/utils/ioutil/common.go
M	vendor/github.com/go-git/go-git/v5/utils/merkletrie/difftree.go
M	vendor/github.com/go-git/go-git/v5/utils/merkletrie/filesystem/node.go
M	vendor/github.com/go-git/go-git/v5/worktree.go
A	vendor/github.com/skeema/knownhosts/knownhosts.go
A	vendor/golang.org/x/crypto/argon2/blamka_amd64.go
A	vendor/golang.org/x/crypto/argon2/blamka_amd64.s
A	vendor/golang.org/x/crypto/argon2/blamka_ref.go
A	vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
A	vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
A	vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go
A	vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
A	vendor/golang.org/x/crypto/blake2b/blake2b_ref.go
A	vendor/golang.org/x/crypto/blake2b/register.go
A	vendor/golang.org/x/crypto/hkdf/hkdf.go
A	vendor/golang.org/x/crypto/sha3/hashes_generic.go
A	vendor/golang.org/x/crypto/sha3/keccakf.go
A	vendor/golang.org/x/crypto/sha3/keccakf_amd64.go
A	vendor/golang.org/x/crypto/sha3/keccakf_amd64.s
A	vendor/golang.org/x/crypto/sha3/register.go
A	vendor/golang.org/x/crypto/sha3/sha3_s390x.go
A	vendor/golang.org/x/crypto/sha3/sha3_s390x.s.git/rebase-apply/patch:9017: new blank line at EOF.
+
.git/rebase-apply/patch:9157: new blank line at EOF.
+
.git/rebase-apply/patch:9297: new blank line at EOF.
+
.git/rebase-apply/patch:9437: new blank line at EOF.
+
.git/rebase-apply/patch:9577: new blank line at EOF.
+
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.

A	vendor/golang.org/x/crypto/sha3/shake_generic.go
A	vendor/golang.org/x/crypto/sha3/xor.go
A	vendor/golang.org/x/crypto/sha3/xor_unaligned.go
A	vendor/golang.org/x/sys/windows/registry/key.go
A	vendor/golang.org/x/sys/windows/registry/mksyscall.go
A	vendor/golang.org/x/sys/windows/registry/syscall.go
A	vendor/golang.org/x/sys/windows/registry/value.go
A	vendor/golang.org/x/text/width/tables10.0.0.go
A	vendor/golang.org/x/text/width/tables11.0.0.go
A	vendor/golang.org/x/text/width/tables12.0.0.go
A	vendor/golang.org/x/text/width/tables13.0.0.go
A	vendor/golang.org/x/text/width/tables15.0.0.go
A	vendor/golang.org/x/text/width/tables9.0.0.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): vendor/github.com/acomagu/bufpipe/CREDITS deleted in UPSTREAM: <carry>: Update go-git to v5.11.0 and renamed to vendor/sigs.k8s.io/yaml/LICENSE in HEAD. Version HEAD of vendor/sigs.k8s.io/yaml/LICENSE left in tree.
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables9.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables9.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables15.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables15.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables13.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables13.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables12.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables12.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables11.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables11.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables10.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/text/width/tables10.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/value.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/sys/windows/registry/value.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/syscall.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/sys/windows/registry/syscall.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/mksyscall.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/sys/windows/registry/mksyscall.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/key.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/sys/windows/registry/key.go left in tree.
Removing vendor/golang.org/x/net/http2/not_go118.go
Removing vendor/golang.org/x/net/http2/not_go115.go
Removing vendor/golang.org/x/net/http2/not_go111.go
Removing vendor/golang.org/x/net/http2/go118.go
Removing vendor/golang.org/x/net/http2/go115.go
Removing vendor/golang.org/x/net/http2/go111.go
CONFLICT (modify/delete): vendor/golang.org/x/crypto/sha3/shake_generic.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/sha3/shake_generic.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/sha3/sha3_s390x.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/sha3/sha3_s390x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/sha3/register.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/sha3/register.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/sha3/hashes_generic.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/sha3/hashes_generic.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/hkdf/hkdf.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/hkdf/hkdf.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/register.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/register.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/blake2b_ref.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/blake2b_ref.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/argon2/blamka_ref.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/argon2/blamka_ref.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/argon2/blamka_amd64.s deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/argon2/blamka_amd64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/argon2/blamka_amd64.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/golang.org/x/crypto/argon2/blamka_amd64.go left in tree.
CONFLICT (modify/delete): vendor/github.com/skeema/knownhosts/knownhosts.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/github.com/skeema/knownhosts/knownhosts.go left in tree.
CONFLICT (rename/delete): vendor/github.com/acomagu/bufpipe/LICENSE deleted in UPSTREAM: <carry>: Update go-git to v5.11.0 and renamed to vendor/github.com/json-iterator/go/LICENSE in HEAD. Version HEAD of vendor/github.com/json-iterator/go/LICENSE left in tree.
Auto-merging vendor/github.com/go-git/go-git/v5/worktree.go
Auto-merging vendor/github.com/go-git/go-git/v5/utils/merkletrie/filesystem/node.go
Auto-merging vendor/github.com/go-git/go-git/v5/utils/merkletrie/difftree.go
Removing vendor/github.com/go-git/go-git/v5/utils/ioutil/pipe_js.go
Removing vendor/github.com/go-git/go-git/v5/utils/ioutil/pipe.go
Auto-merging vendor/github.com/go-git/go-git/v5/utils/ioutil/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/storage/memory/storage.go
Auto-merging vendor/github.com/go-git/go-git/v5/storage/filesystem/storage.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/storage/filesystem/storage.go
Auto-merging vendor/github.com/go-git/go-git/v5/storage/filesystem/object.go
Auto-merging vendor/github.com/go-git/go-git/v5/storage/filesystem/dotgit/dotgit.go
Auto-merging vendor/github.com/go-git/go-git/v5/repository.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/repository.go
Auto-merging vendor/github.com/go-git/go-git/v5/remote.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/remote.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/transport/ssh/common.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/plumbing/transport/ssh/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/transport/server/server.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/transport/internal/common/common.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/plumbing/transport/internal/common/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/transport/git/common.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/plumbing/transport/git/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/transport/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/storer/object.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/reference.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/protocol/packp/srvresp.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/protocol/packp/common.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/object/patch.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/object/commit.go
CONFLICT (modify/delete): vendor/github.com/go-git/go-git/v5/plumbing/hash/hash.go deleted in HEAD and modified in UPSTREAM: <carry>: Update go-git to v5.11.0. Version UPSTREAM: <carry>: Update go-git to v5.11.0 of vendor/github.com/go-git/go-git/v5/plumbing/hash/hash.go left in tree.
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/patch_delta.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/patch_delta.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/parser.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/parser.go
Auto-merging vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/diff_delta.go
Auto-merging vendor/github.com/go-git/go-git/v5/options.go
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/options.go
Auto-merging vendor/github.com/go-git/go-git/v5/config/config.go
Auto-merging vendor/github.com/go-git/go-git/v5/config/branch.go
Auto-merging vendor/github.com/go-git/go-git/v5/Makefile
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/Makefile
Auto-merging vendor/github.com/go-git/go-git/v5/COMPATIBILITY.md
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/COMPATIBILITY.md
Auto-merging vendor/github.com/go-git/go-git/v5/.gitignore
CONFLICT (content): Merge conflict in vendor/github.com/go-git/go-git/v5/.gitignore
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/xor.go
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/xor.go
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/sha3_s390x.s
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/sha3_s390x.s
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/keccakf_amd64.s
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/keccakf_amd64.s
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/keccakf_amd64.go
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/keccakf_amd64.go
Auto-merging vendor/github.com/cloudflare/circl/internal/sha3/keccakf.go
CONFLICT (content): Merge conflict in vendor/github.com/cloudflare/circl/internal/sha3/keccakf.go
Removing vendor/github.com/acomagu/bufpipe/doc.go
CONFLICT (modify/delete): vendor/github.com/acomagu/bufpipe/bufpipe.go deleted in UPSTREAM: <carry>: Update go-git to v5.11.0 and modified in HEAD. Version HEAD of vendor/github.com/acomagu/bufpipe/bufpipe.go left in tree.
CONFLICT (modify/delete): vendor/github.com/acomagu/bufpipe/README.md deleted in UPSTREAM: <carry>: Update go-git to v5.11.0 and modified in HEAD. Version HEAD of vendor/github.com/acomagu/bufpipe/README.md left in tree.
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: Update go-git to v5.11.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-olm-rukpak-container-v4.16.0-202401302041.p0.g977882d.assembly.stream for distgit ose-olm-rukpak.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants