From 890ee0f3fdfab1ceb42d8263b07fc54cf1186dd8 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Wed, 19 Feb 2025 21:26:57 +0800
Subject: [PATCH] hooks: Don't trim contrib/ when inserting MRs

---
 git_hooks_handle.go | 4 ++--

diff --git a/git_hooks_handle.go b/git_hooks_handle.go
index 24f8077a1cbc838889fa0712a3ca178c25970918..6bff10753217c6fdc55b010abad7fab78225fd61 100644
--- a/git_hooks_handle.go
+++ b/git_hooks_handle.go
@@ -130,7 +130,7 @@ 						if all_zero_num_string(old_oid) { // New branch
 							fmt.Fprintln(ssh_stderr, "Acceptable push to new contrib branch: "+ref_name)
 							_, err = database.Exec(ctx,
 								"INSERT INTO merge_requests (repo_id, creator, source_ref, status) VALUES ($1, $2, $3, 'open')",
-								pack_to_hook.repo_id, pack_to_hook.user_id, strings.TrimPrefix(ref_name, "refs/heads/contrib/"),
+								pack_to_hook.repo_id, pack_to_hook.user_id, strings.TrimPrefix(ref_name, "refs/heads/"),
 							)
 							if err != nil {
 								fmt.Fprintln(ssh_stderr, "Error creating merge request:", err.Error())
@@ -140,7 +140,7 @@ 						} else { // Existing contrib branch
 							var existing_merge_request_user_id int
 							err = database.QueryRow(ctx,
 								"SELECT COALESCE(creator, 0) FROM merge_requests WHERE source_ref = $1 AND repo_id = $2",
-								strings.TrimPrefix(ref_name, "refs/heads/contrib/"), pack_to_hook.repo_id,
+								strings.TrimPrefix(ref_name, "refs/heads/"), pack_to_hook.repo_id,
 							).Scan(&existing_merge_request_user_id)
 							if err != nil {
 								if errors.Is(err, pgx.ErrNoRows) {

-- 
2.48.1