From 943c0d3c1a670d5757a4ace490b2ce8f6a2ca160 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 4 Mar 2022 09:24:28 +0000
Subject: [PATCH] * Fix bug#20308,20299

---
 lib/scm/gitrepo.class.php  | 2 +-
 module/repo/css/common.css | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/scm/gitrepo.class.php b/lib/scm/gitrepo.class.php
index 72ef3668a3..a79e9667e4 100644
--- a/lib/scm/gitrepo.class.php
+++ b/lib/scm/gitrepo.class.php
@@ -517,7 +517,7 @@ class GitRepo
         if(!scm::checkRevision($version)) return array();
 
         if($version == 'HEAD' and $branch) $version = $branch;
-        $revision = empty($version) ? $revision : $version;
+        $revision = $version;
         $revision = is_numeric($revision) ? "--skip=$revision $branch" : $revision;
         $count    = $count == 0 ? '' : "-n $count";
 
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index dd70f11981..dd6f423b0d 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -81,7 +81,9 @@ h3 {font-size: 16px;}
 .repoCode tr.commented .comment-btn .icon-wrapper > i:before {font-size: 18px; transform: scale(-1, 1); display: inline-block;}
 .repoCode tr.commented .comment-btn .icon-wrapper:before {display: none;}
 
+.repoCode tr.over.commented .comment-btn {margin-left: -20px; width: 25px; height:18px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper, .repoCode tr.selected.commented .comment-btn .icon-wrapper {line-height: 20px; height: 20px; background: #4183C4; color: #fff; left: -6px;}
+.repoCode tr.over.commented .comment-btn .icon-wrapper {left: 13px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.selected.commented .comment-btn .icon-wrapper > i:before {font-size: 14px;}
 .repoCode tr.over.commented .comment-btn .icon-wrapper:before, .repoCode tr.selected.commented .comment-btn .icon-wrapper:before {display: block;}