Skip to content

Commit 6f9abe8

Browse files
committed
tests fixup, describe now behaves exactly like git's native one
1 parent 8aec1c0 commit 6f9abe8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,8 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
640640

641641
GitDescribeConfig gitDescribeConfig = new GitDescribeConfig();
642642
gitDescribeConfig.setMatch(gitDescribeMatchNeedle);
643+
gitDescribeConfig.setAlways(false);
644+
643645
alterMojoSettings("gitDescribe", gitDescribeConfig);
644646
alterMojoSettings("useNativeGit", useNativeGit);
645647

@@ -648,7 +650,7 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
648650

649651
// then
650652
assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
651-
assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo(gitDescribeMatchNeedle + "-66-g1c6cf6f");
653+
assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).startsWith(gitDescribeMatchNeedle);
652654

653655
assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id");
654656
assertThat(targetProject.getProperties().get("git.commit.id")).isNotEqualTo(commitIdOfMatchNeedle);

0 commit comments

Comments
 (0)