Skip to content

Commit 6ffa454

Browse files
committed
Partial revert "Do not report warning when git shows new reference (go-gitea#6540)"
This reverts commit af5d96e. Except for the test case because Fix mirror bug (go-gitea#33224) implements it now.
1 parent 574ff84 commit 6ffa454

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

services/mirror/mirror_pull.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult {
187187
newCommitID: shas[1],
188188
})
189189

190-
case strings.HasPrefix(lines[i], " * [new ref]"): // new reference - nothing to do
191190
default:
192191
log.Warn("parseRemoteUpdateOutput: unexpected update line %q", lines[i])
193192
}

services/mirror/mirror_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
2121
* [new ref] refs/pull/516/head -> refs/pull/516/head
2222
`
2323
results := parseRemoteUpdateOutput(output, "origin")
24-
assert.Len(t, results, 6)
24+
assert.Len(t, results, 8)
2525
assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String())
2626
assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID)
2727
assert.EqualValues(t, "", results[0].newCommitID)
@@ -45,4 +45,12 @@ func Test_parseRemoteUpdateOutput(t *testing.T) {
4545
assert.EqualValues(t, "refs/heads/test3", results[5].refName.String())
4646
assert.EqualValues(t, "957a993", results[5].oldCommitID)
4747
assert.EqualValues(t, "a87ba5f", results[5].newCommitID)
48+
49+
assert.EqualValues(t, "refs/pull/27/merge", results[6].refName.String())
50+
assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID)
51+
assert.EqualValues(t, "", results[6].newCommitID)
52+
53+
assert.EqualValues(t, "refs/pull/516/head", results[7].refName.String())
54+
assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID)
55+
assert.EqualValues(t, "", results[7].newCommitID)
4856
}

0 commit comments

Comments
 (0)