From 9e884d10550ee916962e49e713544c78ea7d0c76 Mon Sep 17 00:00:00 2001 From: Richard Craggs Date: Fri, 30 Nov 2018 13:12:01 +0000 Subject: [PATCH] Improve tag check rule --- src/main/java/gitruler/GitFunctions.java | 6 +++--- src/main/java/gitruler/GitInteractor.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/gitruler/GitFunctions.java b/src/main/java/gitruler/GitFunctions.java index 0bf2500..bc8ed43 100644 --- 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 index ad2c11a..8fd3fee 100644 --- 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); } }