Skip to content

Commit 99545ae

Browse files
Fix mirror bug (go-gitea#33597) (go-gitea#33607)
Backport go-gitea#33597 by @ericLemanissier follows-up be4e961 This is the same modification as go-gitea@be4e961 but for force-pushes. It is needed, because `git fetch` reveals force pushes for github mirrors: ``` $ git fetch --tags origin remote: Enumerating objects: 22, done. remote: Counting objects: 100% (22/22), done. remote: Compressing objects: 100% (4/4), done. remote: Total 9 (delta 5), reused 8 (delta 5), pack-reused 0 (from 0) Unpacking objects: 100% (9/9), 1.70 KiB | 12.00 KiB/s, done. From https://github.com/conan-io/conan-center-index 729f0f1b8f..48184eddeb refs/pull/26595/head -> refs/pull/26595/head + 0c31ab60a3...1283cca9e7 refs/pull/26595/merge -> refs/pull/26595/merge (forced update) ``` Fix go-gitea#33200 PS: I did not test the modification, but it is the exact same change as the last hunk in https://github.com/go-gitea/gitea/pull/33224/files#diff-bb5cdb90db0f0e7f6716c0e6d0b9cbb67f08d82052b03ab3a7b5e23a1d76aed7 , just moved to the previous case of the switch Co-authored-by: ericLemanissier <[email protected]>
1 parent 7697df9 commit 99545ae

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

services/mirror/mirror_pull.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult {
136136
case strings.HasPrefix(lines[i], " - "): // Delete reference
137137
isTag := !strings.HasPrefix(refName, remoteName+"/")
138138
var refFullName git.RefName
139-
if isTag {
139+
if strings.HasPrefix(refName, "refs/") {
140+
refFullName = git.RefName(refName)
141+
} else if isTag {
140142
refFullName = git.RefNameFromTag(refName)
141143
} else {
142144
refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/"))
@@ -159,8 +161,15 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult {
159161
log.Error("Expect two SHAs but not what found: %q", lines[i])
160162
continue
161163
}
164+
var refFullName git.RefName
165+
if strings.HasPrefix(refName, "refs/") {
166+
refFullName = git.RefName(refName)
167+
} else {
168+
refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/"))
169+
}
170+
162171
results = append(results, &mirrorSyncResult{
163-
refName: git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")),
172+
refName: refFullName,
164173
oldCommitID: shas[0],
165174
newCommitID: shas[1],
166175
})

services/mirror/mirror_test.go

+21-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
1717
- [deleted] (none) -> tag1
1818
+ f895a1e...957a993 test2 -> origin/test2 (forced update)
1919
957a993..a87ba5f test3 -> origin/test3
20+
* [new ref] refs/pull/26595/head -> refs/pull/26595/head
21+
* [new ref] refs/pull/26595/merge -> refs/pull/26595/merge
22+
e0639e38fb..6db2410489 refs/pull/25873/head -> refs/pull/25873/head
23+
+ 1c97ebc746...976d27d52f refs/pull/25873/merge -> refs/pull/25873/merge (forced update)
2024
`
2125
results := parseRemoteUpdateOutput(output, "origin")
22-
assert.Len(t, results, 6)
26+
assert.Len(t, results, 10)
2327
assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String())
2428
assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID)
2529
assert.EqualValues(t, "", results[0].newCommitID)
@@ -43,4 +47,20 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
4347
assert.EqualValues(t, "refs/heads/test3", results[5].refName.String())
4448
assert.EqualValues(t, "957a993", results[5].oldCommitID)
4549
assert.EqualValues(t, "a87ba5f", results[5].newCommitID)
50+
51+
assert.EqualValues(t, "refs/pull/26595/head", results[6].refName.String())
52+
assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID)
53+
assert.EqualValues(t, "", results[6].newCommitID)
54+
55+
assert.EqualValues(t, "refs/pull/26595/merge", results[7].refName.String())
56+
assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID)
57+
assert.EqualValues(t, "", results[7].newCommitID)
58+
59+
assert.EqualValues(t, "refs/pull/25873/head", results[8].refName.String())
60+
assert.EqualValues(t, "e0639e38fb", results[8].oldCommitID)
61+
assert.EqualValues(t, "6db2410489", results[8].newCommitID)
62+
63+
assert.EqualValues(t, "refs/pull/25873/merge", results[9].refName.String())
64+
assert.EqualValues(t, "1c97ebc746", results[9].oldCommitID)
65+
assert.EqualValues(t, "976d27d52f", results[9].newCommitID)
4666
}

0 commit comments

Comments
 (0)