Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change .dirty to -dirty #50

Closed
wants to merge 1 commit into from
Closed

change .dirty to -dirty #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/groovy/com/palantir/gradle/gitversion/GitVersionPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class GitVersionPlugin implements Plugin<Project> {
DescribeFirstParentCommand describe = new DescribeFirstParentCommand(git.getRepository())
String version = describe.call() ?: UNSPECIFIED_VERSION
boolean isClean = git.status().call().isClean()
return version + (isClean ? '' : '.dirty')
return version + (isClean ? '' : '-dirty')
} catch (Throwable t) {
return UNSPECIFIED_VERSION
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/com/palantir/gradle/gitversion/GitVersionPluginTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class GitVersionPluginTests extends Specification {
BuildResult buildResult = with('printVersion').build()

then:
buildResult.output.contains(':printVersion\nunspecified.dirty\n')
buildResult.output.contains(':printVersion\nunspecified-dirty\n')
}

def 'git describe when annotated tag is present' () {
Expand Down Expand Up @@ -248,7 +248,7 @@ class GitVersionPluginTests extends Specification {
BuildResult buildResult = with('printVersion').build()

then:
buildResult.output.contains(':printVersion\n1.0.0.dirty\n')
buildResult.output.contains(':printVersion\n1.0.0-dirty\n')
}

def 'git describe and clean when symlink is present' () {
Expand Down