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.

Sign up for GitHub

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

Jump to bottom

git: Remove usage of git symbolic-ref. #4464

Merged
merged 1 commit into from
Jan 12, 2022
Merged

git: Remove usage of git symbolic-ref. #4464

merged 1 commit into from
Jan 12, 2022

Conversation

wlynch
Copy link
Member

@wlynch wlynch commented Jan 10, 2022 •
edited
Loading

Changes

Not 100% sure why we were doing this before, but as of
git/git@9081a42
this is causing Git to return this error when trying to call git checkout -f FETCH_HEAD:

BUG: builtin/checkout.c:1102: should be able to skip past 'refs/heads/' in 'refs/remotes/origin/HEAD'!

IIUC, the symbolic-ref command isn't necessary so we can safely remove
it. Local HEAD will be set on the final git checkout call.

New command flow:

[git init /tmp/git-init-3587814010]
[git remote add origin /tmp/git-init-3399927535]
[git config http.sslVerify false]
[git fetch origin --force ]
[git show -q --pretty=format:%H FETCH_HEAD]
[git checkout -f FETCH_HEAD]

/kind bug

Fixes #4463

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Docs included if any changes are user facing
  • Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including
    functionality, content, code)
  • Release notes block below has been filled in or deleted (only if no user facing changes)

Release Notes

NONE

@wlynch
git: Remove usage of git symbolic-ref.
cda14e1 
Not 100% sure why we were doing this before, but as of
git/git@9081a42
this is causing Git to return this error when trying to call `git
checkout -f FETCH_HEAD`:

```
BUG: builtin/checkout.c:1102: should be able to skip past 'refs/heads/' in 'refs/remotes/origin/HEAD'!
```

IIUC, the symbolic-ref command isn't necessary so we can safely remove
it. Local HEAD will be set on the final `git checkout` call.

New command flow:

```
[git init /tmp/git-init-3587814010]
[git remote add origin /tmp/git-init-3399927535]
[git config http.sslVerify false]
[git fetch origin --force ]
[git show -q --pretty=format:%H FETCH_HEAD]
[git checkout -f FETCH_HEAD]
```
@tekton-robot tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Jan 10, 2022
@tekton-robot tekton-robot requested review from dibyom and jerop January 10, 2022 22:30
@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 10, 2022
@wlynch
Copy link
Member Author

wlynch commented Jan 10, 2022

/assign @vinamra28 - Would like your review here, since this is undoing changes made in 9aff0a0 and want to double check that I'm not undoing important behavior.

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/git/git.go 69.3% 69.1% -0.2

@wlynch
Copy link
Member Author

wlynch commented Jan 10, 2022

/test pull-tekton-pipeline-integration-tests

@vinamra28
Copy link
Member

/assign @vinamra28 - Would like your review here, since this is undoing changes made in 9aff0a0 and want to double check that I'm not undoing important behavior.

@wlynch, thanks for doing this. At the time of adding the commit 9aff0a0, there were some failures on openshift based clusters but now I guess it is resolved.

/lgtm

@tekton-robot
Copy link
Collaborator

@vinamra28: changing LGTM is restricted to collaborators

In response to this:

/assign @vinamra28 - Would like your review here, since this is undoing changes made in 9aff0a0 and want to double check that I'm not undoing important behavior.

@wlynch, thanks for doing this. At the time of adding the commit 9aff0a0, there were some failures on openshift based clusters but now I guess it is resolved.

/lgtm

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.

@jerop jerop added this to the Pipelines v0.32 milestone Jan 11, 2022
@ghost
Copy link

ghost commented Jan 11, 2022

Nice, cheers @wlynch !

/lgtm

@tekton-robot tekton-robot assigned ghost Jan 11, 2022
@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2022
@vdemeester
Copy link
Member

/cc @chmouel

@tekton-robot tekton-robot requested a review from chmouel January 12, 2022 08:57
@chmouel
Copy link
Member

chmouel commented Jan 12, 2022

/lgtm

i don't see why Revision needs to be set in struct (if not specified by user) either...

vdemeester
vdemeester approved these changes Jan 12, 2022
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/meow

@tekton-robot
Copy link
Collaborator

@vdemeester: cat image

In response to this:

/meow

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.

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2022
@vdemeester
Copy link
Member

/retest

@tekton-robot tekton-robot merged commit 097eeb4 into tektoncd:main Jan 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

@dibyom dibyom Awaiting requested review from dibyom

@jerop jerop Awaiting requested review from jerop

@chmouel chmouel Awaiting requested review from chmouel

Assignees

@chmouel chmouel

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Pipelines v0.32
Development

Successfully merging this pull request may close these issues.

Git Tests broken in Git 2.35
6 participants
@wlynch @tekton-robot @vinamra28 @vdemeester @chmouel @jerop