Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Use merge reference instead of head #247

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Conversation

fkorotkov
Copy link
Contributor

@fkorotkov fkorotkov requested a review from edigaryev September 22, 2022 18:06
@fkorotkov
Copy link
Contributor Author

I've manually checked that for https://github.com/flutter/flutter this works and head is still not working which leads to an incident:

git fetch origin pull/112191/head:test
fatal: couldn't find remote ref pull/112191/headgit fetch origin pull/112191/merge:test
remote: Enumerating objects: 32, done.
remote: Counting objects: 100% (32/32), done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 32 (delta 13), reused 13 (delta 5), pack-reused 0
Unpacking objects: 100% (32/32), 43.51 KiB | 1.89 MiB/s, done.
From github.com:flutter/flutter
 * [new ref]               refs/pull/112191/merge -> test

@fkorotkov fkorotkov enabled auto-merge (squash) September 22, 2022 18:08
@fkorotkov
Copy link
Contributor Author

@fkorotkov fkorotkov merged commit 3180069 into master Sep 22, 2022
@fkorotkov fkorotkov deleted the use-merge-reference branch September 22, 2022 18:33
@fkorotkov
Copy link
Contributor Author

On the other hand it confuses users of GitHub actions sometimes actions/checkout#504 but I guess it's better then the situation like right now when the cloning is not working. I guess if the merge commit had the same issue GitHub people would've notice it quicker.

fkorotkov added a commit that referenced this pull request Sep 23, 2022
Since the recent change in #247
fkorotkov added a commit that referenced this pull request Sep 23, 2022
Since the recent change in #247
fkorotkov added a commit that referenced this pull request Sep 24, 2022
In case merge ref is not available. These edge cases were cauhgt by integration tests in Cirrus CI:

1. Cloning a PR with conflicts.
2. Cloning a closed PR.

Related to #247 and #249
fkorotkov added a commit that referenced this pull request Sep 25, 2022
* Fall back to checking out HEAD

In case merge ref is not available. These edge cases were cauhgt by integration tests in Cirrus CI:

1. Cloning a PR with conflicts.
2. Cloning a closed PR.

Related to #247 and #249

* Use FetchContext
fkorotkov added a commit that referenced this pull request Oct 20, 2022
And only if it fails like during the recent GH incident, try to fetch merge ref.

We've see bunch of weird but rare transient fetch failures since #247 got deployed.

Fixes cirruslabs/cirrus-ci-docs#1086
@fkorotkov fkorotkov mentioned this pull request Oct 20, 2022
fkorotkov added a commit that referenced this pull request Oct 20, 2022
And only if it fails like during the recent GH incident, try to fetch merge ref.

We've see bunch of weird but rare transient fetch failures since #247 got deployed.

Fixes cirruslabs/cirrus-ci-docs#1086
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants