#221: ensure that git.closest.tag.name and git.closest.tag.count prefer annotated tags (like the discribe command) and also works with patterns like 'light*'

Author: TheSnoozer

src/main/java/pl/project13/jgit/DescribeCommand.java

@@ -353,8 +353,6 @@ private String createMatchPattern() {
       return ".*";
     }
 
-    return "^refs/tags/\\Q" +
-            matchOption.get().replace("*", "\\E.*\\Q").replace("?", "\\E.\\Q") +
-            "\\E$";
+    return jGitCommon.createMatchPattern(matchOption.get());
   }
 }

src/main/java/pl/project13/jgit/JGitCommon.java

@@ -106,7 +106,7 @@ private Pair<RevCommit, String> getClosestRevCommit(@NotNull Repository repo, Re
     if (gitDescribe != null) {
       includeLightweightTags = gitDescribe.getTags();
       if (!"*".equals(gitDescribe.getMatch())) {
-        matchPattern = gitDescribe.getMatch();
+        matchPattern = createMatchPattern(gitDescribe.getMatch());
       }
     }
     Map<ObjectId, List<String>> tagObjectIdToName = findTagObjectIds(repo, includeLightweightTags, matchPattern);
@@ -121,6 +121,12 @@ private Pair<RevCommit, String> getClosestRevCommit(@NotNull Repository repo, Re
     return Pair.of(revCommit, tagName);
   }
 
+  protected String createMatchPattern(String pattern) {
+    return "^refs/tags/\\Q" +
+            pattern.replace("*", "\\E.*\\Q").replace("?", "\\E.\\Q") +
+            "\\E$";
+  }
+
   protected Map<ObjectId, List<String>> findTagObjectIds(@NotNull Repository repo, boolean includeLightweightTags, String matchPattern) {
     Map<ObjectId, List<DatedRevTag>> commitIdsToTags = getCommitIdsToTags(repo, includeLightweightTags, matchPattern);
     Map<ObjectId, List<String>> commitIdsToTagNames = transformRevTagsMapToDateSortedTagNames(commitIdsToTags);

src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java

@@ -914,6 +914,73 @@ public void shouldGenerateClosestTagInformationWithIncludeLightweightTagsForClos
     assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "1");
   }
 
+  @Test
+  @Parameters(method = "useNativeGit")
+  public void shouldGenerateClosestTagInformationWithIncludeLightweightTagsForClosestTagAndPreferAnnotatedTags(boolean useNativeGit) throws Exception {
+    // given
+    mavenSandbox
+                .withParentProject("my-jar-project", "jar")
+                .withNoChildProject()
+                .withGitRepoInParent(AvailableGitTestRepo.WITH_COMMIT_THAT_HAS_TWO_TAGS)
+                .create();
+
+    MavenProject targetProject = mavenSandbox.getParentProject();
+    setProjectToExecuteMojoIn(targetProject);
+
+    GitDescribeConfig gitDescribe = createGitDescribeConfig(true, 9);
+    gitDescribe.setDirty("-customDirtyMark");
+    gitDescribe.setTags(true); // include lightweight tags
+
+    mojo.setGitDescribe(gitDescribe);
+    mojo.setUseNativeGit(useNativeGit);
+
+    // when
+    mojo.execute();
+
+    // then
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.abbrev", "b6a73ed");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "newest-tag-1-gb6a73ed74-customDirtyMark");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "newest-tag");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "1");
+  }
+
+  @Test
+  @Parameters(method = "useNativeGit")
+  public void shouldGenerateClosestTagInformationWithIncludeLightweightTagsForClosestTagAndFilter(boolean useNativeGit) throws Exception {
+    // given
+    mavenSandbox
+                .withParentProject("my-jar-project", "jar")
+                .withNoChildProject()
+                .withGitRepoInParent(AvailableGitTestRepo.WITH_COMMIT_THAT_HAS_TWO_TAGS)
+                .create();
+
+    MavenProject targetProject = mavenSandbox.getParentProject();
+    setProjectToExecuteMojoIn(targetProject);
+
+    GitDescribeConfig gitDescribe = createGitDescribeConfig(true, 9);
+    gitDescribe.setDirty("-customDirtyMark");
+    gitDescribe.setTags(true); // include lightweight tags
+    gitDescribe.setMatch("light*");
+
+    mojo.setGitDescribe(gitDescribe);
+    mojo.setUseNativeGit(useNativeGit);
+
+    // when
+    mojo.execute();
+
+    // then
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.abbrev", "b6a73ed");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "lightweight-tag-1-gb6a73ed74-customDirtyMark");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "lightweight-tag");
+
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "1");
+  }
+
   private GitDescribeConfig createGitDescribeConfig(boolean forceLongFormat, int abbrev) {
     GitDescribeConfig gitDescribeConfig = new GitDescribeConfig();
     gitDescribeConfig.setTags(true);