mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-03-04 08:14:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix mirror bug (#33597)

Browse source 
follows-up be4e961240883778c44d9651eaaf9ab8723bbbb0

Fix https://github.com/go-gitea/gitea/issues/33200

---------

Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 57997f1518bada128a6aa775306ec15626cc0691)
This commit is contained in:
ericLemanissier 2025-02-15 11:29:44 +01:00 • committed by Gusted
parent 0e5e383425
commit 85124bcfcf
Failed to generate hash of commit
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/mirror/mirror_pull.go
View file

@ -135,7 +135,9 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult {
case strings.HasPrefix(lines[i], " - "): // Delete reference case strings.HasPrefix(lines[i], " - "): // Delete reference
isTag := !strings.HasPrefix(refName, remoteName+"/") isTag := !strings.HasPrefix(refName, remoteName+"/")
var refFullName git.RefName var refFullName git.RefName
if isTag { if strings.HasPrefix(refName, "refs/") {
refFullName = git.RefName(refName)
} else if isTag {
refFullName = git.RefNameFromTag(refName) refFullName = git.RefNameFromTag(refName)
} else { } else {
refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")) refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/"))
@ -158,8 +160,15 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult {
log.Error("Expect two SHAs but not what found: %q", lines[i]) log.Error("Expect two SHAs but not what found: %q", lines[i])
continue continue
} }
var refFullName git.RefName
if strings.HasPrefix(refName, "refs/") {
refFullName = git.RefName(refName)
} else {
refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/"))
}
results = append(results, &mirrorSyncResult{ results = append(results, &mirrorSyncResult{
refName: git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")), refName: refFullName,
oldCommitID: shas[0], oldCommitID: shas[0],
newCommitID: shas[1], newCommitID: shas[1],
}) })

22
services/mirror/mirror_test.go
View file

@ -17,11 +17,13 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
- [deleted] (none) -> tag1 - [deleted] (none) -> tag1
+ f895a1e...957a993 test2 -> origin/test2 (forced update) + f895a1e...957a993 test2 -> origin/test2 (forced update)
957a993..a87ba5f test3 -> origin/test3 957a993..a87ba5f test3 -> origin/test3
* [new ref] refs/pull/27/merge -> refs/pull/27/merge * [new ref] refs/pull/26595/head -> refs/pull/26595/head
* [new ref] refs/pull/516/head -> refs/pull/516/head * [new ref] refs/pull/26595/merge -> refs/pull/26595/merge
` e0639e38fb..6db2410489 refs/pull/25873/head -> refs/pull/25873/head
+ 1c97ebc746...976d27d52f refs/pull/25873/merge -> refs/pull/25873/merge (forced update)
`
results := parseRemoteUpdateOutput(output, "origin") results := parseRemoteUpdateOutput(output, "origin")
assert.Len(t, results, 8) assert.Len(t, results, 10)
assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String()) assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String())
assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID) assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID)
assert.EqualValues(t, "", results[0].newCommitID) assert.EqualValues(t, "", results[0].newCommitID)
@ -46,11 +48,19 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
assert.EqualValues(t, "957a993", results[5].oldCommitID) assert.EqualValues(t, "957a993", results[5].oldCommitID)
assert.EqualValues(t, "a87ba5f", results[5].newCommitID) assert.EqualValues(t, "a87ba5f", results[5].newCommitID)
assert.EqualValues(t, "refs/pull/27/merge", results[6].refName.String()) assert.EqualValues(t, "refs/pull/26595/head", results[6].refName.String())
assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID) assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID)
assert.EqualValues(t, "", results[6].newCommitID) assert.EqualValues(t, "", results[6].newCommitID)
assert.EqualValues(t, "refs/pull/516/head", results[7].refName.String()) assert.EqualValues(t, "refs/pull/26595/merge", results[7].refName.String())
assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID) assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID)
assert.EqualValues(t, "", results[7].newCommitID) assert.EqualValues(t, "", results[7].newCommitID)
assert.EqualValues(t, "refs/pull/25873/head", results[8].refName.String())
assert.EqualValues(t, "e0639e38fb", results[8].oldCommitID)
assert.EqualValues(t, "6db2410489", results[8].newCommitID)
assert.EqualValues(t, "refs/pull/25873/merge", results[9].refName.String())
assert.EqualValues(t, "1c97ebc746", results[9].oldCommitID)
assert.EqualValues(t, "976d27d52f", results[9].newCommitID)
} }