From dfe87fadd86b584cc2846467afd9f540d28dce37 Mon Sep 17 00:00:00 2001 From: Runxi Yu <me@runxiyu.org> Date: Sat, 29 Mar 2025 22:27:54 +0800 Subject: [PATCH] Properly format files... --- git_hooks_handle_other.go | 4 +--- http_handle_repo_contrib_one.go | 2 +- diff --git a/git_hooks_handle_other.go b/git_hooks_handle_other.go index 8bd1f7a926cf2e130fb9920cce4bfb0c2db8d554..d4ee43adf7b8b2f029557075e096c66bec1c937c 100644 --- a/git_hooks_handle_other.go +++ b/git_hooks_handle_other.go @@ -24,9 +24,7 @@ "go.lindenii.runxiyu.org/lindenii-common/ansiec" "go.lindenii.runxiyu.org/lindenii-common/clog" ) -var ( - errGetFD = errors.New("unable to get file descriptor") -) +var errGetFD = errors.New("unable to get file descriptor") // hooksHandler handles a connection from hookc via the // unix socket. diff --git a/http_handle_repo_contrib_one.go b/http_handle_repo_contrib_one.go index 0df2e4559f680746f5fd7cb11643643065898ed8..642323ba6e75a2d7295bafd4026f00eae5469558 100644 --- a/http_handle_repo_contrib_one.go +++ b/http_handle_repo_contrib_one.go @@ -72,7 +72,7 @@ if mergeBases, err = srcCommit.MergeBase(dstCommit); err != nil { errorPage500(writer, params, "Error getting merge base: "+err.Error()) return } - + if len(mergeBases) < 1 { errorPage500(writer, params, "No merge base found for this merge request; these two branches do not share any common history") // TODO -- 2.48.1