Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-04 20:45:52 +01:00
Code Issues Packages Projects Releases Activity

"Unpeel" annotated tags to get correct changeset

Browse Source 
If we just parse the object id of the reference for annotated tags, we
get the annotated tag object and not the reference the tag refers to.
This commit is contained in:
René Pfeuffer
2020-08-27 11:15:13 +02:00
parent 565ec3ff3c
commit 96d16fe4cc
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitTagsCommand.java
View File

@@ -127,7 +127,7 @@ public class GitTagsCommand extends AbstractGitCommand implements TagsCommand {
Tag tag = null;
try {
RevObject revObject = revWalk.parseAny(ref.getObjectId());
RevObject revObject = GitUtil.getCommit(repository, revWalk, ref);
if (revObject != null) {
String name = GitUtil.getTagName(ref);

14
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitTagsCommandTest.java
View File

@@ -54,10 +54,16 @@ public class GitTagsCommandTest extends AbstractGitCommandTestBase {
final GitTagsCommand tagsCommand = new GitTagsCommand(gitContext);
final List<Tag> tags = tagsCommand.getTags();
assertThat(tags).hasSize(2);
assertThat(tags.get(0).getName()).isEqualTo("1.0.0");
assertThat(tags.get(0).getDate()).contains(1598348105000L); // Annotated - Take tag date
assertThat(tags.get(1).getName()).isEqualTo("test-tag");
assertThat(tags.get(1).getDate()).contains(1339416344000L); // Lightweight - Take commit date
Tag annotatedTag = tags.get(0);
assertThat(annotatedTag.getName()).isEqualTo("1.0.0");
assertThat(annotatedTag.getDate()).contains(1598348105000L); // Annotated - Take tag date
assertThat(annotatedTag.getRevision()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec");
Tag lightweightTag = tags.get(1);
assertThat(lightweightTag.getName()).isEqualTo("test-tag");
assertThat(lightweightTag.getDate()).contains(1339416344000L); // Lightweight - Take commit date
assertThat(lightweightTag.getRevision()).isEqualTo("86a6645eceefe8b9a247db5eb16e3d89a7e6e6d1");
}
@Override