diff options
| author | Runxi Yu <me@runxiyu.org> | 2025-02-19 21:26:57 +0800 |
|---|---|---|
| committer | Runxi Yu <me@runxiyu.org> | 2025-02-19 21:26:57 +0800 |
| commit | 890ee0f3fdfab1ceb42d8263b07fc54cf1186dd8 (patch) | |
| tree | 35a8f00baedfe49dcb7723b39a3faee61c5f04b1 /git_hooks_handle.go | |
| parent | all: Use COALESCE to handle some nullable database fields (diff) | |
| download | forge-890ee0f3fdfab1ceb42d8263b07fc54cf1186dd8.tar.gz forge-890ee0f3fdfab1ceb42d8263b07fc54cf1186dd8.tar.zst forge-890ee0f3fdfab1ceb42d8263b07fc54cf1186dd8.zip | |
hooks: Don't trim contrib/ when inserting MRs
Diffstat (limited to 'git_hooks_handle.go')
| -rw-r--r-- | git_hooks_handle.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git_hooks_handle.go b/git_hooks_handle.go index 24f8077..6bff107 100644 --- a/git_hooks_handle.go +++ b/git_hooks_handle.go @@ -130,7 +130,7 @@ func hooks_handle_connection(conn net.Conn) { 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 @@ func hooks_handle_connection(conn net.Conn) { 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) { |