From 9dbb9a42d67ab8de9056ed1a036db9a53d8d28a5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 30 Jun 2022 16:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20compare=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81sha=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/compare_controller.rb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index 1aab7adbe..be7afaa1d 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -6,13 +6,18 @@ class CompareController < ApplicationController
   end
 
   def show
-    load_compare_params
-    compare
-    @merge_status, @merge_message = get_merge_message
-    @page_size = page_size <= 0 ? 1 : page_size
-    @page_limit = page_limit <=0 ? 15 : page_limit
-    @page_offset = (@page_size -1) * @page_limit
-    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
+    if params[:type] == "sha" 
+      load_compare_params
+      @compare_result ||= gitea_compare(@base, @head)
+    else 
+      load_compare_params
+      compare
+      @merge_status, @merge_message = get_merge_message
+      @page_size = page_size <= 0 ? 1 : page_size
+      @page_limit = page_limit <=0 ? 15 : page_limit
+      @page_offset = (@page_size -1) * @page_limit
+      Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
+    end
   end
 
   private