From a79962edfbc31848d44bffc0fd75676d4c8fdb37 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Wed, 05 Mar 2025 10:44:38 +0800
Subject: [PATCH] repo/contrib/one: var/etc code quality modifications

---
 http_handle_repo_contrib_one.go | 11 +++++------

diff --git a/http_handle_repo_contrib_one.go b/http_handle_repo_contrib_one.go
index 7ed0d6fd446c1d7cb6450e81dd931cdc61b0b483..f4db20c8fe735cde19840cbc566992859933d65e 100644
--- a/http_handle_repo_contrib_one.go
+++ b/http_handle_repo_contrib_one.go
@@ -19,7 +19,8 @@ 	var err error
 	var title, status, source_ref, destination_branch string
 	var repo *git.Repository
 	var source_ref_hash plumbing.Hash
-	var source_commit *object.Commit
+	var source_commit, destination_commit, merge_base *object.Commit
+	var merge_bases []*object.Commit
 
 	mr_id_string = params["mr_id"].(string)
 	mr_id_int64, err := strconv.ParseInt(mr_id_string, 10, strconv.IntSize)
@@ -61,19 +62,17 @@ 		http.Error(w, "Error getting destination branch hash: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-	destination_commit, err := repo.CommitObject(destination_branch_hash)
-	if err != nil {
+	if destination_commit, err = repo.CommitObject(destination_branch_hash); err != nil {
 		http.Error(w, "Error getting destination commit: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
 	params["destination_commit"] = destination_commit
 
-	merge_bases, err := source_commit.MergeBase(destination_commit)
-	if err != nil {
+	if merge_bases, err = source_commit.MergeBase(destination_commit); err != nil {
 		http.Error(w, "Error getting merge base: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
-	merge_base := merge_bases[0]
+	merge_base = merge_bases[0]
 	params["merge_base"] = merge_base
 
 	patch, err := merge_base.Patch(source_commit)

-- 
2.48.1