[release-4.14]: OCPBUGS-27680,OCPBUGS-27595: UPSTREAM: <carry>: Update go-git to v5.11.0

[kevinrizza]

No description provided.

[openshift-ci]

@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-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

• DOWNSTREAM_OWNERS [kevinrizza,oceanc80]

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

[openshift-ci-robot]

@kevinrizza: This pull request references Jira Issue OCPBUGS-27680, which is invalid:

• expected dependent Jira Issue OCPBUGS-27681 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-27595, which is invalid:

• expected dependent Jira Issue OCPBUGS-27596 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

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.

[kevinrizza]

/bugzilla refresh

[kevinrizza]

/bugzilla refresh

[kevinrizza]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-4.13

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.

[kevinrizza]

/label backport-risk-assessed

[kevinrizza]

/bugzilla refresh

[openshift-ci-robot]

@kevinrizza: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

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-robot]

@kevinrizza: This pull request references Jira Issue OCPBUGS-27680, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-27681 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-27681 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

This pull request references Jira Issue OCPBUGS-27595, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-27596 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-27596 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

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.

[kuiwang02]

/label cherry-pick-approved
/label qe-approved

[openshift-ci-robot]

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

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-27681 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-27681 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

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

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-27596 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-27596 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

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-robot]

@kevinrizza: Jira Issue OCPBUGS-27680: All pull requests linked via external trackers have merged:

• openshift/operator-framework-rukpak#73

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

Jira Issue OCPBUGS-27595: All pull requests linked via external trackers have merged:

• openshift/operator-framework-rukpak#73

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

In response to this:

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: #73 failed to apply on top of branch "release-4.13":

Applying: UPSTREAM: <carry>: Update go-git to v5.11.0
.git/rebase-apply/patch:5098: trailing whitespace.
// Avoids recomputation of similar s2k key derivations. 
.git/rebase-apply/patch:5126: trailing whitespace.
	
.git/rebase-apply/patch:5143: trailing whitespace.
	} 
.git/rebase-apply/patch:7150: trailing whitespace.
// if is not in the above range 
.git/rebase-apply/patch:7228: trailing whitespace.
			mode:      IteratedSaltedS2K, 
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
A	vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
A	vendor/golang.org/x/tools/go/packages/golist.go
A	vendor/golang.org/x/tools/go/packages/packages.go
A	vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
A	vendor/golang.org/x/tools/internal/gcimporter/bexport.go
A	vendor/golang.org/x/tools/internal/gcimporter/bimport.go
A	vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
A	vendor/golang.org/x/tools/internal/gcimporter/iexport.go
A	vendor/golang.org/x/tools/internal/gcimporter/iimport.go
A	vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
A	vendor/golang.org/x/tools/internal/gocommand/invoke.go
M	vendor/golang.org/x/tools/internal/typeparams/common.go
A	vendor/golang.org/x/tools/internal/typesinternal/types.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/typesinternal/types.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/tools/internal/typesinternal/types.go left in tree.
Auto-merging vendor/golang.org/x/tools/internal/typeparams/common.go
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gocommand/invoke.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/tools/internal/gocommand/invoke.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.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/tools/internal/gcimporter/ureader_yes.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gcimporter/iimport.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/tools/internal/gcimporter/iimport.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gcimporter/iexport.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/tools/internal/gcimporter/iexport.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gcimporter/gcimporter.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/tools/internal/gcimporter/gcimporter.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/gcimporter/bimport.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/tools/internal/gcimporter/bimport.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/types/objectpath/objectpath.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/tools/go/types/objectpath/objectpath.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/packages/packages.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/tools/go/packages/packages.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/packages/golist.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/tools/go/packages/golist.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.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/tools/go/internal/packagesdriver/sizes.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.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/tools/go/gcexportdata/gcexportdata.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
Removing vendor/github.com/onsi/gomega/tools
Removing vendor/github.com/mitchellh/go-homedir/homedir.go
Removing vendor/github.com/mitchellh/go-homedir/README.md
Removing vendor/github.com/mitchellh/go-homedir/LICENSE
Removing vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go
Removing vendor/github.com/google/go-cmp/cmp/export_panic.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
Removing vendor/github.com/go-git/go-git/v5/references.go
Removing vendor/github.com/go-git/go-git/v5/plumbing/object/common.go
Removing vendor/github.com/go-git/gcfg/go1_2.go
Removing vendor/github.com/go-git/gcfg/go1_0.go
Removing vendor/github.com/cyphar/filepath-securejoin/.travis.yml
Removing vendor/github.com/acomagu/bufpipe/doc.go
Removing vendor/github.com/acomagu/bufpipe/bufpipe.go
Removing vendor/github.com/acomagu/bufpipe/README.md
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.13

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]

[ART PR BUILD NOTIFIER]

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