Skip to content

Fix for https://github.com/ktoso/maven-git-commit-id-plugin/issues/146 #147

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

Merged
merged 1 commit into from
Dec 12, 2014
Merged

Fix for https://github.com/ktoso/maven-git-commit-id-plugin/issues/146 #147

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
12 changes: 9 additions & 3 deletions src/main/java/pl/project13/maven/git/NativeGitProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,15 @@ protected String getBranchName() throws IOException {
}

private String getBranch(File canonical) {
String branch = tryToRunGitCommand(canonical, "symbolic-ref HEAD");
if (branch != null) {
branch = branch.replace("refs/heads/", "");
String branch = null;
try{
branch = tryToRunGitCommand(canonical, "symbolic-ref HEAD");
if (branch != null) {
branch = branch.replace("refs/heads/", "");
}
}catch(RuntimeException e){
// it seems that git repro is in 'DETACHED HEAD'-State, using Commid-Id as Branch
branch = getCommitId();
}
return branch;
}
Expand Down
5 changes: 0 additions & 5 deletions src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,11 +621,6 @@ public void shouldExtractTagsOnGivenCommit(boolean useNativeGit) throws Exceptio
@Test
@Parameters(method = "useNativeGit")
public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception {
if (System.getenv().get("TRAVIS").equals("true") && System.getenv().get("CI").equals("true")) {
// FIXME: this test has trouble on travis, I think it's because of not pulling everything?
return;
}

// given
mavenSandbox.withParentProject("my-pom-project", "pom")
.withChildProject("my-jar-module", "jar")
Expand Down