From eb860f742a4aa94d2acfc5099570bb154988868a Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Mon, 7 Aug 2023 15:20:07 +0800
Subject: [PATCH] fixed @compare_result null done

---
 app/views/compare/show.json.jbuilder | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/views/compare/show.json.jbuilder b/app/views/compare/show.json.jbuilder
index 26a7cb769..135537cda 100644
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@@ -1,19 +1,21 @@
 json.commits_count @compare_result['CommitsCount']
 # json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
 json.commits do
-  json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
-    json.author do
-      json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
-    end
+  if @compare_result['Commits'].present?
+    json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
+      json.author do
+        json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+      end
 
-    json.committer do
-      json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+      json.committer do
+        json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+      end
+      json.timestamp render_unix_time(commit['Committer']['When'])
+      json.time_from_now time_from_now(commit['Committer']['When'])
+      json.created_at render_format_time_with_date(commit['Committer']['When'])
+      json.message commit['CommitMessage']
+      json.sha commit['Sha']
     end
-    json.timestamp render_unix_time(commit['Committer']['When'])
-    json.time_from_now time_from_now(commit['Committer']['When'])
-    json.created_at render_format_time_with_date(commit['Committer']['When'])
-    json.message commit['CommitMessage']
-    json.sha commit['Sha']
   end
 end