diff options
| -rw-r--r-- | git_hooks_handle_other.go | 4 | ||||
| -rw-r--r-- | http_handle_repo_contrib_one.go | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/git_hooks_handle_other.go b/git_hooks_handle_other.go index 8bd1f7a..d4ee43a 100644 --- a/git_hooks_handle_other.go +++ b/git_hooks_handle_other.go @@ -24,9 +24,7 @@ import ( "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 0df2e45..642323b 100644 --- a/http_handle_repo_contrib_one.go +++ b/http_handle_repo_contrib_one.go @@ -72,7 +72,7 @@ func httpHandleRepoContribOne(writer http.ResponseWriter, request *http.Request, 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 |