From 4b3463c392aaa983594782834f9ed4751a52352e Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Wed, 6 Apr 2016 17:10:30 +0200 Subject: [PATCH] Adding feature to ignore tags by regexp * Also testing tag in feature branch #23 --- CHANGELOG.md | 17 +++ .../gitchangelog/api/GitChangelogApi.java | 12 ++- .../gitchangelog/internal/git/GitRepo.java | 20 ++-- .../internal/settings/Settings.java | 13 +++ .../internal/git/GitRepoTest.java | 101 ++++++++++++++++-- .../gitchangelog/test/LibPerformanceTest.java | 3 +- .../assertions/testAuthorsCommits.md | 15 +++ src/test/resources/assertions/testCommits.md | 15 +++ .../assertions/testCommitsVariables.md | 24 +++++ .../assertions/testIssueTypesIssuesCommits.md | 26 +++++ .../assertions/testIssuesAuthorsCommits.md | 9 ++ .../resources/assertions/testIssuesCommits.md | 15 +++ .../resources/assertions/testTagsCommits.md | 16 +++ .../testTagsIssuesAuthorsCommits.md | 16 +++ .../assertions/testTagsIssuesCommits.md | 12 +++ .../assertions/testThatIssuesCanBeRemoved.md | 15 +++ 16 files changed, 312 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e42633a2..364ea37c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ Changelog of Git Changelog. +## Next release +### GitHub [#23](https://github.com/tomasbjerre/git-changelog-lib/issues/23) changelog is generating incorrect order of commits/Issues + +**Testing tag in feature branch** + + +[d9fb26da2290cc3](https://github.com/tomasbjerre/git-changelog-lib/commit/d9fb26da2290cc3) Tomas Bjerre *2016-04-06 19:35:19* + + +### Other changes + +**Updating CHANGELOG.md** + + +[96ee3bb55e4da2d](https://github.com/tomasbjerre/git-changelog-lib/commit/96ee3bb55e4da2d) Tomas Bjerre *2016-03-20 13:25:18* + + ## 1.39 ### Other changes diff --git a/src/main/java/se/bjurr/gitchangelog/api/GitChangelogApi.java b/src/main/java/se/bjurr/gitchangelog/api/GitChangelogApi.java index 9cf3ae65..a82d196c 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/GitChangelogApi.java +++ b/src/main/java/se/bjurr/gitchangelog/api/GitChangelogApi.java @@ -128,6 +128,15 @@ public GitChangelogApi withIgnoreCommitsWithMesssage(String ignoreCommitsIfMessa return this; } + /** + * A regular expression that is evaluated on each tag. If it matches, the tag + * will be filtered out and not included in the changelog. + */ + public GitChangelogApi withIgnoreTagsIfNameMatches(String ignoreTagsIfNameMatches) { + settings.setIgnoreTagsIfNameMatches(ignoreTagsIfNameMatches); + return this; + } + /** * Some commits may not be included in any tag. Commits that not released yet * may not be tagged. This is a "virtual tag", added to @@ -370,7 +379,8 @@ private Changelog getChangelog(GitRepo gitRepo) throws GitChangelogRepositoryExc .or(gitRepo.getCommit(ZERO_COMMIT)); ObjectId toId = getId(gitRepo, settings.getToRef(), settings.getToCommit()) // .or(gitRepo.getRef(REF_MASTER)); - GitRepoData gitRepoData = gitRepo.getGitRepoData(fromId, toId, settings.getUntaggedName()); + GitRepoData gitRepoData = gitRepo.getGitRepoData(fromId, toId, settings.getUntaggedName(), + settings.getIgnoreTagsIfNameMatches()); List diff = gitRepoData.getGitCommits(); List issues = new IssueParser(settings, diff).parseForIssues(); if (settings.ignoreCommitsWithoutIssue()) { diff --git a/src/main/java/se/bjurr/gitchangelog/internal/git/GitRepo.java b/src/main/java/se/bjurr/gitchangelog/internal/git/GitRepo.java index e3cf2cda..f604e63d 100644 --- a/src/main/java/se/bjurr/gitchangelog/internal/git/GitRepo.java +++ b/src/main/java/se/bjurr/gitchangelog/internal/git/GitRepo.java @@ -5,6 +5,7 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Maps.newHashMap; +import static java.util.regex.Pattern.compile; import static org.eclipse.jgit.lib.ObjectId.fromString; import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.REF_MASTER; import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.ZERO_COMMIT; @@ -31,6 +32,7 @@ import se.bjurr.gitchangelog.internal.git.model.GitTag; import com.google.common.base.Function; +import com.google.common.base.Optional; public class GitRepo { private static final Function TO_GITCOMMIT = new Function() { @@ -81,16 +83,14 @@ public GitRepo(File repo) throws GitChangelogRepositoryException { * {@link GitChangelogApiConstants#ZERO_COMMIT}, it is included. * @param to * To and including this commit. - * @param untaggedName - * @throws GitChangelogRepositoryException */ - public GitRepoData getGitRepoData(ObjectId from, ObjectId to, String untaggedName) - throws GitChangelogRepositoryException { + public GitRepoData getGitRepoData(ObjectId from, ObjectId to, String untaggedName, + Optional ignoreTagsIfNameMatches) throws GitChangelogRepositoryException { Git git = null; try { git = new Git(repository); List gitCommits = getGitCommits(git, from, to); - return new GitRepoData(gitCommits, gitTags(git, gitCommits, untaggedName)); + return new GitRepoData(gitCommits, gitTags(git, gitCommits, untaggedName, ignoreTagsIfNameMatches)); } catch (Exception e) { throw new GitChangelogRepositoryException(toString(), e); } finally { @@ -98,11 +98,17 @@ public GitRepoData getGitRepoData(ObjectId from, ObjectId to, String untaggedNam } } - private List gitTags(Git git, List gitCommits, String untaggedName) throws GitAPIException { + private List gitTags(Git git, List gitCommits, String untaggedName, + Optional ignoreTagsIfNameMatches) throws GitAPIException { List refs = newArrayList(); List refList = git.tagList().call(); Map refsPerCommit = newHashMap(); for (Ref ref : refList) { + if (ignoreTagsIfNameMatches.isPresent()) { + if (compile(ignoreTagsIfNameMatches.get()).matcher(ref.getName()).matches()) { + continue; + } + } refsPerCommit.put(toHash(getPeeled(ref).getName()), ref); } @@ -133,8 +139,8 @@ private List gitTags(Git git, List gitCommits, String untagge private List getGitCommits(Git git, ObjectId from, ObjectId to) throws GitChangelogRepositoryException { try { - final List toList = newArrayList(git.log().add(to).call()); if (from.name().equals(firstCommit().name())) { + final List toList = newArrayList(git.log().add(to).call()); return newArrayList(transform(toList, TO_GITCOMMIT)); } diff --git a/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java b/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java index 53600669..8beabd21 100644 --- a/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java +++ b/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java @@ -55,6 +55,11 @@ public class Settings { * Include all commits to here. Any commit hash. */ private String toCommit; + /** + * A regular expression that is evaluated on each tag. If it matches, the tag + * will be filtered out and not included in the changelog. + */ + private String ignoreTagsIfNameMatches; /** * A regular expression that is evaluated on the commit message of each commit. * If it matches, the commit will be filtered out and not included in the @@ -200,6 +205,10 @@ public void setIgnoreCommitsIfMessageMatches(String ignoreCommitsIfMessageMatche this.ignoreCommitsIfMessageMatches = ignoreCommitsIfMessageMatches; } + public void setIgnoreTagsIfNameMatches(String ignoreTagsIfNameMatches) { + this.ignoreTagsIfNameMatches = ignoreTagsIfNameMatches; + } + public void setJiraIssuePattern(String jiraIssuePattern) { this.jiraIssuePattern = jiraIssuePattern; } @@ -259,6 +268,10 @@ public String getUntaggedName() { return fromNullable(untaggedName).or(DEFAULT_UNTAGGED_NAME); } + public Optional getIgnoreTagsIfNameMatches() { + return fromNullable(ignoreTagsIfNameMatches); + } + public void setUntaggedName(String untaggedName) { this.untaggedName = untaggedName; } diff --git a/src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoTest.java b/src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoTest.java index efa13cb5..9baad4db 100644 --- a/src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoTest.java +++ b/src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoTest.java @@ -1,19 +1,23 @@ package se.bjurr.gitchangelog.internal.git; import static com.google.common.collect.Lists.reverse; +import static com.google.common.collect.Maps.newHashMap; import static org.assertj.core.api.Assertions.assertThat; import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.REF_MASTER; import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.ZERO_COMMIT; import java.io.File; import java.util.List; +import java.util.Map; import org.eclipse.jgit.lib.ObjectId; import org.junit.Before; import org.junit.Test; import se.bjurr.gitchangelog.internal.git.model.GitCommit; +import se.bjurr.gitchangelog.internal.git.model.GitTag; +import com.google.common.base.Optional; import com.google.common.io.Resources; public class GitRepoTest { @@ -36,8 +40,8 @@ public void testThatRepoCanBeFound() throws Exception { @Test public void testThatTagsCanBeListed() throws Exception { GitRepo gitRepo = getGitRepo(); - GitRepoData gitRepoData = gitRepo - .getGitRepoData(gitRepo.getCommit(ZERO_COMMIT), gitRepo.getRef(REF_MASTER), "No tag"); + GitRepoData gitRepoData = gitRepo.getGitRepoData(gitRepo.getCommit(ZERO_COMMIT), gitRepo.getRef(REF_MASTER), + "No tag", Optional. absent()); assertThat(gitRepoData.getGitTags()).isNotEmpty(); } @@ -58,12 +62,76 @@ public void testThatCommitsCanBeRetrieved() throws Exception { assertThat(gitRepo.getCommit(TAG_1_0_HASH).name()).isEqualTo(TAG_1_0_HASH); } + @Test + public void testThatTagInFeatureBranchDoesNotIncludeCommitsInItsMainBranch() throws Exception { + GitRepo gitRepo = getGitRepo(); + ObjectId from = gitRepo.getCommit("87c0d72888961712d4d63dd6298c24c1133a6b51"); + ObjectId to = gitRepo.getRef("test"); + + GitRepoData gitRepoData = gitRepo.getGitRepoData(from, to, "No tag", Optional.of("asdasdasd")); + Map perTag = perTag(gitRepoData.getGitTags()); + assertThat(gitRepoData.getGitTags())// + .hasSize(2); + assertThat(gitRepoData.getGitTags())// + .hasSize(2); + assertThat(perTag.keySet())// + .hasSize(2)// + .contains("No tag"); + GitTag noTagTag = perTag.get("No tag"); + + assertThat(noTagTag.getGitCommits())// + .hasSize(2); + assertThat(noTagTag.getGitCommits().get(0).getMessage().trim())// + .isEqualTo("Some stuff in test again"); + assertThat(noTagTag.getGitCommits().get(1).getMessage().trim())// + .isEqualTo("Merge branch 'test-feature' into test"); + + GitTag testFeatureTag = perTag.get("refs/tags/tag-in-test-feature"); + assertThat(testFeatureTag.getGitCommits())// + .hasSize(2); + assertThat(testFeatureTag.getGitCommits().get(0).getMessage().trim())// + .isEqualTo("Some stuff in test-feature"); + // TODO: This is a bug! #23 + assertThat(testFeatureTag.getGitCommits().get(1).getMessage().trim())// + .isEqualTo("some stuff in test branch"); + } + + @Test + public void testThatTagCanBeIgnored() throws Exception { + GitRepo gitRepo = getGitRepo(); + ObjectId from = gitRepo.getCommit("87c0d72888961712d4d63dd6298c24c1133a6b51"); + ObjectId to = gitRepo.getRef("test"); + + GitRepoData gitRepoData = gitRepo.getGitRepoData(from, to, "No tag", Optional.of(".*tag-in-test-feature$")); + Map perTag = perTag(gitRepoData.getGitTags()); + assertThat(gitRepoData.getGitTags())// + .hasSize(1); + assertThat(gitRepoData.getGitTags())// + .hasSize(1); + assertThat(perTag.keySet())// + .hasSize(1)// + .contains("No tag"); + GitTag noTagTag = perTag.get("No tag"); + + assertThat(noTagTag.getGitCommits())// + .hasSize(4); + assertThat(noTagTag.getGitCommits().get(0).getMessage().trim())// + .isEqualTo("Some stuff in test again"); + assertThat(noTagTag.getGitCommits().get(1).getMessage().trim())// + .isEqualTo("Merge branch 'test-feature' into test"); + assertThat(noTagTag.getGitCommits().get(2).getMessage().trim())// + .isEqualTo("Some stuff in test-feature"); + assertThat(noTagTag.getGitCommits().get(3).getMessage().trim())// + .isEqualTo("some stuff in test branch"); + } + @Test public void testThatCommitsBetweenCommitAndReferenceCanBeListed() throws Exception { GitRepo gitRepo = getGitRepo(); ObjectId firstCommit = gitRepo.getCommit(ZERO_COMMIT); ObjectId lastCommit = gitRepo.getRef(REF_MASTER); - List diff = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag").getGitCommits(); + List diff = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag", Optional. absent()) + .getGitCommits(); assertThat(diff.size()).isGreaterThan(10); assertThat(reverse(diff).get(0).getHash()).startsWith(FIRST_COMMIT_HASH); } @@ -73,7 +141,7 @@ public void testThatCommitsBetweenZeroCommitAndCommitCanBeListed() throws Except GitRepo gitRepo = getGitRepo(); ObjectId firstCommit = gitRepo.getCommit(ZERO_COMMIT); ObjectId lastCommit = gitRepo.getCommit(TAG_1_0_HASH); - GitRepoData gitRepoData = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag"); + GitRepoData gitRepoData = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag", Optional. absent()); assertThat(gitRepoData.getGitCommits()).as("Commits in first release.").hasSize(6); assertThat(gitRepoData.getGitTags()).as("Tags in first release.").hasSize(1); assertThat(reverse(gitRepoData.getGitCommits()).get(0).getHash()).startsWith(FIRST_COMMIT_HASH); @@ -84,9 +152,17 @@ public void testThatCommitsSecondReleaseCommitCanBeListed() throws Exception { GitRepo gitRepo = getGitRepo(); ObjectId firstRelease = gitRepo.getRef("refs/tags/1.0"); ObjectId secondRelease = gitRepo.getRef("refs/tags/1.1"); - List diff = gitRepo.getGitRepoData(firstRelease, secondRelease, "No tag").getGitCommits(); - assertThat(diff).as("Commits in second release.").hasSize(8); - assertThat(reverse(diff).get(0).getHash()).startsWith("3950"); + List diff = gitRepo.getGitRepoData(firstRelease, secondRelease, "No tag", Optional. absent()) + .getGitCommits(); + assertThat(diff).as("Commits in second release from 1.0.").hasSize(8); + assertThat(diff.get(7).getHash()).startsWith("3950"); + assertThat(diff.get(0).getHash()).startsWith(secondRelease.getName().substring(0, 10)); + + ObjectId firstCommit = gitRepo.getCommit(ZERO_COMMIT); + diff = gitRepo.getGitRepoData(firstCommit, secondRelease, "No tag", Optional. absent()).getGitCommits(); + assertThat(diff).as("Commits in second release from zero commit.").hasSize(14); + assertThat(diff.get(7).getHash()).startsWith("3950"); + assertThat(diff.get(0).getHash()).startsWith(secondRelease.getName().substring(0, 10)); } @Test @@ -94,7 +170,8 @@ public void testThatCommitsBetweenCommitAndCommitCanBeListed() throws Exception GitRepo gitRepo = getGitRepo(); ObjectId firstCommit = gitRepo.getCommit(FIRST_COMMIT_HASH_FULL); ObjectId lastCommit = gitRepo.getCommit("e3766e2d4bc6d206475c5d2ed96b3f967a6e157e"); - List diff = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag").getGitCommits(); + List diff = gitRepo.getGitRepoData(firstCommit, lastCommit, "No tag", Optional. absent()) + .getGitCommits(); assertThat(diff).isNotEmpty(); assertThat(reverse(diff).get(0).getHash())// .as("first")// @@ -104,6 +181,14 @@ public void testThatCommitsBetweenCommitAndCommitCanBeListed() throws Exception .startsWith("e3766e2d4bc6d20"); } + private Map perTag(List gitTags) { + Map map = newHashMap(); + for (GitTag gitTag : gitTags) { + map.put(gitTag.getName(), gitTag); + } + return map; + } + private GitRepo getGitRepo() throws Exception { return new GitRepo(gitRepoFile); } diff --git a/src/test/java/se/bjurr/gitchangelog/test/LibPerformanceTest.java b/src/test/java/se/bjurr/gitchangelog/test/LibPerformanceTest.java index 95ed38f9..c913e6e1 100644 --- a/src/test/java/se/bjurr/gitchangelog/test/LibPerformanceTest.java +++ b/src/test/java/se/bjurr/gitchangelog/test/LibPerformanceTest.java @@ -20,6 +20,7 @@ import se.bjurr.gitchangelog.internal.git.GitRepoData; import se.bjurr.gitchangelog.internal.git.model.GitTag; +import com.google.common.base.Optional; import com.google.common.base.Stopwatch; public class LibPerformanceTest { @@ -57,7 +58,7 @@ public void testThatGimmitsBetweenTagsCanBeFound() throws Exception { ObjectId fromId = gitRepo.getCommit(ZERO_COMMIT); ObjectId toId = gitRepo.getRef(REF_MASTER); - GitRepoData gitRepoData = gitRepo.getGitRepoData(fromId, toId, UNTAGGED_NAME); + GitRepoData gitRepoData = gitRepo.getGitRepoData(fromId, toId, UNTAGGED_NAME, Optional. absent()); List allTags = gitRepoData.getGitTags(); int i = 0; for (GitTag from : allTags) { diff --git a/src/test/resources/assertions/testAuthorsCommits.md b/src/test/resources/assertions/testAuthorsCommits.md index 045d3cbf..e27db31d 100644 --- a/src/test/resources/assertions/testAuthorsCommits.md +++ b/src/test/resources/assertions/testAuthorsCommits.md @@ -4,6 +4,21 @@ Changelog of Git Changelog. * Tomas Bjerre +[8371342ad0d887d](https://server/8371342ad0d887d) Tomas Bjerre *2016-04-06 18:40:51* + +Some stuff in test again + + +[090e7f4b11223c4](https://server/090e7f4b11223c4) Tomas Bjerre *2016-04-06 15:13:04* + +Some stuff in test-feature + + +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) Tomas Bjerre *2016-04-06 15:12:12* + +some stuff in test branch + + [87c0d7288896171](https://server/87c0d7288896171) Tomas Bjerre *2016-03-19 20:32:32* Multiple issues diff --git a/src/test/resources/assertions/testCommits.md b/src/test/resources/assertions/testCommits.md index 6446e048..b55de56c 100644 --- a/src/test/resources/assertions/testCommits.md +++ b/src/test/resources/assertions/testCommits.md @@ -2,6 +2,21 @@ Changelog of Git Changelog. +## Tomas Bjerre - 2016-04-06 18:40:51 +[8371342ad0d887d](https://server/8371342ad0d887d) + +Some stuff in test again + +## Tomas Bjerre - 2016-04-06 15:13:04 +[090e7f4b11223c4](https://server/090e7f4b11223c4) + +Some stuff in test-feature + +## Tomas Bjerre - 2016-04-06 15:12:12 +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) + +some stuff in test branch + ## Tomas Bjerre - 2016-03-19 20:32:32 [87c0d7288896171](https://server/87c0d7288896171) diff --git a/src/test/resources/assertions/testCommitsVariables.md b/src/test/resources/assertions/testCommitsVariables.md index 030a2ac9..b1cef9b6 100644 --- a/src/test/resources/assertions/testCommitsVariables.md +++ b/src/test/resources/assertions/testCommitsVariables.md @@ -2,6 +2,30 @@ Changelog of Git Changelog. +## Commit 8371342ad0d887d + Message: Some stuff in test again + + Message Title: Some stuff in test again + + Message Body: + + +## Commit 090e7f4b11223c4 + Message: Some stuff in test-feature + + Message Title: Some stuff in test-feature + + Message Body: + + +## Commit c5d37f5e964afd5 + Message: some stuff in test branch + + Message Title: some stuff in test branch + + Message Body: + + ## Commit 87c0d7288896171 Message: Multiple issues diff --git a/src/test/resources/assertions/testIssueTypesIssuesCommits.md b/src/test/resources/assertions/testIssueTypesIssuesCommits.md index 7c1fda1b..56dc7a26 100644 --- a/src/test/resources/assertions/testIssueTypesIssuesCommits.md +++ b/src/test/resources/assertions/testIssueTypesIssuesCommits.md @@ -3,6 +3,17 @@ Changelog of Git Changelog. ## No tag +### No issue supplied + + +These commits has no issue. + +**Some stuff in test again** + + +[8371342ad0d887d](https://github.com/tomasbjerre/git-changelog-lib/commit/8371342ad0d887d) Tomas Bjerre *2016-04-06 18:40:51* + +## tag-in-test-feature ### Bugs #### Mixed bugs @@ -51,6 +62,21 @@ Changelog of Git Changelog. [cc0fbbd8bc63955](https://github.com/tomasbjerre/git-changelog-lib/commit/cc0fbbd8bc63955) Tomas Bjerre *2016-02-15 16:30:35* +### No issue supplied + + +These commits has no issue. + +**Some stuff in test-feature** + + +[090e7f4b11223c4](https://github.com/tomasbjerre/git-changelog-lib/commit/090e7f4b11223c4) Tomas Bjerre *2016-04-06 15:13:04* + +**some stuff in test branch** + + +[c5d37f5e964afd5](https://github.com/tomasbjerre/git-changelog-lib/commit/c5d37f5e964afd5) Tomas Bjerre *2016-04-06 15:12:12* + ## test-lightweight-2 ### CQ #### [CQ1234](http://cq/1234) 1234 diff --git a/src/test/resources/assertions/testIssuesAuthorsCommits.md b/src/test/resources/assertions/testIssuesAuthorsCommits.md index 75d4a089..9d31457b 100644 --- a/src/test/resources/assertions/testIssuesAuthorsCommits.md +++ b/src/test/resources/assertions/testIssuesAuthorsCommits.md @@ -58,6 +58,15 @@ Adding stuff with a jira ## No issue supplied ### Tomas Bjerre +2016-04-06 18:40:51 +Some stuff in test again + +2016-04-06 15:13:04 +Some stuff in test-feature + +2016-04-06 15:12:12 +some stuff in test branch + 2016-02-15 16:30:35 This is 1.0 tagged commit diff --git a/src/test/resources/assertions/testIssuesCommits.md b/src/test/resources/assertions/testIssuesCommits.md index d4f1eac7..bed2d2b9 100644 --- a/src/test/resources/assertions/testIssuesCommits.md +++ b/src/test/resources/assertions/testIssuesCommits.md @@ -66,6 +66,21 @@ Adding stuff with a jira ## No issue supplied +### Tomas Bjerre - 2016-04-06 18:40:51 +[8371342ad0d887d](https://server/8371342ad0d887d) + +Some stuff in test again + +### Tomas Bjerre - 2016-04-06 15:13:04 +[090e7f4b11223c4](https://server/090e7f4b11223c4) + +Some stuff in test-feature + +### Tomas Bjerre - 2016-04-06 15:12:12 +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) + +some stuff in test branch + ### Tomas Bjerre - 2016-02-15 16:30:35 [3f62b35d1317311](https://server/3f62b35d1317311) diff --git a/src/test/resources/assertions/testTagsCommits.md b/src/test/resources/assertions/testTagsCommits.md index e2d4c34e..fa6cc07e 100644 --- a/src/test/resources/assertions/testTagsCommits.md +++ b/src/test/resources/assertions/testTagsCommits.md @@ -3,6 +3,22 @@ Changelog of Git Changelog. ## No tag +### Tomas Bjerre - 2016-04-06 18:40:51 +[8371342ad0d887d](https://server/8371342ad0d887d) + +Some stuff in test again + +## tag-in-test-feature +### Tomas Bjerre - 2016-04-06 15:13:04 +[090e7f4b11223c4](https://server/090e7f4b11223c4) + +Some stuff in test-feature + +### Tomas Bjerre - 2016-04-06 15:12:12 +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) + +some stuff in test branch + ### Tomas Bjerre - 2016-03-19 20:32:32 [87c0d7288896171](https://server/87c0d7288896171) diff --git a/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md b/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md index 1ebb3016..ff5dd2f3 100644 --- a/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md +++ b/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md @@ -3,6 +3,13 @@ Changelog of Git Changelog. ## No tag +### No issue supplied +* Tomas Bjerre +[8371342ad0d887d](https://server/8371342ad0d887d) *2016-04-06 18:40:51* +Some stuff in test again + + +## tag-in-test-feature ### Bugs Mixed bugs * Tomas Bjerre [20e333f8e108f77](https://server/20e333f8e108f77) *2016-03-19 20:32:19* @@ -34,6 +41,15 @@ Adding stuff Adding stuff with a jira +### No issue supplied +* Tomas Bjerre +[090e7f4b11223c4](https://server/090e7f4b11223c4) *2016-04-06 15:13:04* +Some stuff in test-feature + +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) *2016-04-06 15:12:12* +some stuff in test branch + + ## test-lightweight-2 ### CQ [CQ1234](http://cq/1234) 1234 * Tomas Bjerre diff --git a/src/test/resources/assertions/testTagsIssuesCommits.md b/src/test/resources/assertions/testTagsIssuesCommits.md index 61e471c1..87b3dc43 100644 --- a/src/test/resources/assertions/testTagsIssuesCommits.md +++ b/src/test/resources/assertions/testTagsIssuesCommits.md @@ -3,6 +3,11 @@ Changelog of Git Changelog. ## No tag +### No issue supplied +[8371342ad0d887d](https://server/8371342ad0d887d) 2016-04-06 18:40:51 +Some stuff in test again + +## tag-in-test-feature ### Bugs Mixed bugs [20e333f8e108f77](https://server/20e333f8e108f77) 2016-03-19 20:32:19 More stuff tagged with twice @@ -24,6 +29,13 @@ Adding stuff [cc0fbbd8bc63955](https://server/cc0fbbd8bc63955) 2016-02-15 16:30:35 Adding stuff with a jira +### No issue supplied +[090e7f4b11223c4](https://server/090e7f4b11223c4) 2016-04-06 15:13:04 +Some stuff in test-feature + +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) 2016-04-06 15:12:12 +some stuff in test branch + ## test-lightweight-2 ### CQ [CQ1234](http://cq/1234) 1234 [a9bd03b34b255ff](https://server/a9bd03b34b255ff) 2016-02-15 16:30:35 diff --git a/src/test/resources/assertions/testThatIssuesCanBeRemoved.md b/src/test/resources/assertions/testThatIssuesCanBeRemoved.md index d4f1eac7..bed2d2b9 100644 --- a/src/test/resources/assertions/testThatIssuesCanBeRemoved.md +++ b/src/test/resources/assertions/testThatIssuesCanBeRemoved.md @@ -66,6 +66,21 @@ Adding stuff with a jira ## No issue supplied +### Tomas Bjerre - 2016-04-06 18:40:51 +[8371342ad0d887d](https://server/8371342ad0d887d) + +Some stuff in test again + +### Tomas Bjerre - 2016-04-06 15:13:04 +[090e7f4b11223c4](https://server/090e7f4b11223c4) + +Some stuff in test-feature + +### Tomas Bjerre - 2016-04-06 15:12:12 +[c5d37f5e964afd5](https://server/c5d37f5e964afd5) + +some stuff in test branch + ### Tomas Bjerre - 2016-02-15 16:30:35 [3f62b35d1317311](https://server/3f62b35d1317311)