From 826b7b979c5e514f056836aebf6fd5422fbcd843 Mon Sep 17 00:00:00 2001
From: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
Date: Tue, 30 May 2023 13:12:21 +0800
Subject: [PATCH] Fix missing reference prefix of commits when sync mirror
 repository (#24994)

replace #24868
just a patch to fix #24824 in v1.19.4
The reference name of commits when synchronizing should also has prefix
like refs/heads/<branch-name>.
---
 services/mirror/mirror_pull.go      |  2 +-
 services/mirror/mirror_pull_test.go | 84 +++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 services/mirror/mirror_pull_test.go

diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
index 60699294c1..7f85ad9448 100644
--- a/services/mirror/mirror_pull.go
+++ b/services/mirror/mirror_pull.go
@@ -143,7 +143,7 @@ func parseRemoteUpdateOutput(output string) []*mirrorSyncResult {
 				continue
 			}
 			results = append(results, &mirrorSyncResult{
-				refName:     refName,
+				refName:     git.BranchPrefix + refName, // the reference name of commits should also has prefix.
 				oldCommitID: shas[0],
 				newCommitID: shas[1],
 			})
diff --git a/services/mirror/mirror_pull_test.go b/services/mirror/mirror_pull_test.go
new file mode 100644
index 0000000000..a0b89ec813
--- /dev/null
+++ b/services/mirror/mirror_pull_test.go
@@ -0,0 +1,84 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+package mirror
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseRemoteUpdateOutput(t *testing.T) {
+	tests := []struct {
+		input   string
+		results []*mirrorSyncResult
+	}{
+		{
+			// create tag
+			input: "From https://xxx.com/xxx/xxx\n * [new tag]         v1.4       -> v1.4\n",
+			results: []*mirrorSyncResult{
+				{
+					refName:     "refs/tags/v1.4",
+					oldCommitID: gitShortEmptySha,
+					newCommitID: "",
+				},
+			},
+		},
+		{
+			// delete tag and create branch
+			input: "From https://xxx.com/xxx/xxx\n - [deleted]         (none)     -> v1.0.1\n * [new branch]      test/t3    -> test/t3\n * [new branch]      test/t4    -> test/t4\n",
+			results: []*mirrorSyncResult{
+				{
+					refName:     "v1.0.1",
+					oldCommitID: "",
+					newCommitID: gitShortEmptySha,
+				},
+				{
+					refName:     "refs/heads/test/t3",
+					oldCommitID: gitShortEmptySha,
+					newCommitID: "",
+				},
+				{
+					refName:     "refs/heads/test/t4",
+					oldCommitID: gitShortEmptySha,
+					newCommitID: "",
+				},
+			},
+		},
+		{
+			// delete branch
+			input: "From https://xxx.com/xxx/xxx\n - [deleted]         (none)     -> test/t2\n",
+			results: []*mirrorSyncResult{
+				{
+					refName:     "test/t2",
+					oldCommitID: "",
+					newCommitID: gitShortEmptySha,
+				},
+			},
+		},
+		{
+			// new commits
+			input: "From https://xxx.com/xxx/xxx\n   aeb77a8..425ec44  test/t3    -> test/t3\n   93b2801..3e1d4c2  test/t4    -> test/t4\n",
+			results: []*mirrorSyncResult{
+				{
+					refName:     "refs/heads/test/t3",
+					oldCommitID: "aeb77a8",
+					newCommitID: "425ec44",
+				},
+				{
+					refName:     "refs/heads/test/t4",
+					oldCommitID: "93b2801",
+					newCommitID: "3e1d4c2",
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.input, func(t *testing.T) {
+			results := parseRemoteUpdateOutput(test.input)
+			assert.EqualValues(t, test.results, results, fmt.Sprintf("%#v", results))
+		})
+	}
+}