#339: git.tags yields wrong results for JGit

Author: TheSnoozer

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

@@ -52,27 +52,31 @@ public JGitCommon(LoggerBridge log) {
     this.log = log;
   }
 
-  public Collection<String> getTags(Repository repo, final ObjectId headId) throws GitAPIException {
+  public Collection<String> getTags(Repository repo, final ObjectId objectId) throws GitAPIException {
     try (Git git = Git.wrap(repo)) {
       try (RevWalk walk = new RevWalk(repo)) {
-        Collection<String> tags = getTags(git, headId, walk);
+        Collection<String> tags = getTags(git, objectId, walk);
         walk.dispose();
         return tags;
       }
     }
   }
 
-  private Collection<String> getTags(final Git git, final ObjectId headId, final RevWalk finalWalk) throws GitAPIException {
+  private Collection<String> getTags(final Git git, final ObjectId objectId, final RevWalk finalWalk) throws GitAPIException {
     List<Ref> tagRefs = git.tagList().call();
     Collection<Ref> tagsForHeadCommit = Collections2.filter(tagRefs, new Predicate<Ref>() {
-      @Override public boolean apply(Ref tagRef) {
-        boolean lightweightTag = tagRef.getObjectId().equals(headId);
+      @Override
+      public boolean apply(Ref tagRef) {
         try {
-          // TODO make this configurable (most users shouldn't really care too much what kind of tag it is though)
-          return lightweightTag || finalWalk.parseTag(tagRef.getObjectId()).getObject().getId().equals(headId); // or normal tag
-        } catch (IOException e) {
-          return false;
+          final RevCommit tagCommit = finalWalk.parseCommit(tagRef.getObjectId());
+          final RevCommit objectCommit = finalWalk.parseCommit(objectId);
+          if (finalWalk.isMergedInto(objectCommit, tagCommit)) {
+            return true;
+          }
+        } catch (Exception ignored) {
+          log.debug("Failed while getTags [{}] -- ", tagRef, ignored);
         }
+        return false;
       }
     });
     Collection<String> tags = Collections2.transform(tagsForHeadCommit, new Function<Ref, String>() {

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

@@ -890,6 +890,39 @@ public void shouldExtractTagsOnGivenCommit(boolean useNativeGit) throws Exceptio
       .containsOnly("lightweight-tag", "newest-tag");
   }
 
+  @Test
+  @Parameters(method = "useNativeGit")
+  public void shouldExtractTagsOnGivenCommitWithOldestCommit(boolean useNativeGit) throws Exception {
+    // given
+    mavenSandbox.withParentProject("my-jar-project", "jar")
+                .withNoChildProject()
+                .withGitRepoInParent(AvailableGitTestRepo.WITH_COMMIT_THAT_HAS_TWO_TAGS)
+                .create();
+
+    try (final Git git = git("my-jar-project")) {
+      git.reset().setMode(ResetCommand.ResetType.HARD).setRef("9597545").call();
+    }
+
+    MavenProject targetProject = mavenSandbox.getParentProject();
+    setProjectToExecuteMojoIn(targetProject);
+
+    mojo.setGitDescribe(null);
+    mojo.setUseNativeGit(useNativeGit);
+
+    // when
+    mojo.execute();
+
+    // then
+    Properties properties = targetProject.getProperties();
+    assertGitPropertiesPresentInProject(properties);
+
+    assertThat(properties).satisfies(new ContainsKeyCondition("git.tags"));
+    assertThat(properties.get("git.tags").toString()).doesNotContain("refs/tags/");
+
+    assertThat(Splitter.on(",").split(properties.get("git.tags").toString()))
+      .containsOnly("annotated-tag", "lightweight-tag", "newest-tag");
+  }
+
   @Test
   @Parameters(method = "useNativeGit")
   public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception {