Improve tag check rule

rcraggs · Nov 30, 2018 · 9e884d1 · 9e884d1
1 parent 91fbaf0
commit 9e884d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/gitruler/GitFunctions.java b/src/main/java/gitruler/GitFunctions.java
@@ -464,10 +464,10 @@ boolean doesTagExist(String tag) throws IOException {
      * @param tag the name of the tag
      * @return True if the commit is correctly tagged.
      */
-    boolean isCommitTagged(RevCommit commit, String tag) throws IOException {
+    boolean isCommitTagged(RevCommit commit, String tag) throws IOException, GitAPIException {
 
-        Ref tagRef = repo.findRef(tag);
-        return tagRef != null && tagRef.getObjectId().equals(commit.toObjectId());
+        RevCommit revCommit = getCommitFromRefString(tag);
+        return revCommit != null && revCommit.getId().equals(commit.getId());
     }
 
     /**

diff --git a/src/main/java/gitruler/GitInteractor.java b/src/main/java/gitruler/GitInteractor.java
@@ -194,7 +194,7 @@ private RuleResult checkTagIsOnCommitWithMessage(Rule r) {
         }else{
             try {
                 result.setPassed(gitFunctions.isCommitTagged(commit, r.getTag()));
-            } catch (IOException e) {
+            } catch (IOException | GitAPIException e) {
                 result = createResultFromException(e);
             }
         }