has git check to check project directory and custom location

[domcc]

We have a slightly unconventional layout for some of our projects that means the .git folder may not be in the project.rootProject.file('.git') location. Also the code in GitInfoService uses the project path and not the root .git location
def grgit = Grgit.open(currentDir: project.projectDir)

Also in one case we have a git repo where the java project is not at the root directory so we need a way to specify the location of the .git location.

[dcoraboeuf]

Hi Dominic,

So you'd wish to be able to specific the location of your .git directory using a configuration parameters, like:

versioning {
   gitDirectory = "..."
}

Would that be OK?

[domcc]

Wow quick reply! Something like that i was actually trying to work out how to create a PR. i changed to this:

$ git diff
diff --git a/build.gradle b/build.gradle
index 3d9079c..3ffb5ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,12 @@ dependencies {
     compile "org.eclipse.jgit:org.eclipse.jgit.ui:${jgitVersion}"
     compile "org.eclipse.jgit:org.eclipse.jgit:${jgitVersion}"
     compile 'org.tmatesoft.svnkit:svnkit:1.8.12'
+    testCompile "junit:junit:4.12"
+    testCompile "commons-lang:commons-lang:2.6"
+    testCompile "commons-io:commons-io:2.5"
+
+
+
 }

 /**
diff --git a/src/main/groovy/net/nemerosa/versioning/VersioningExtension.groovy b/src/main/groovy/net/nemerosa/versioning/VersioningExtension.groovy
index c623f98..c8af50f 100644
--- a/src/main/groovy/net/nemerosa/versioning/VersioningExtension.groovy
+++ b/src/main/groovy/net/nemerosa/versioning/VersioningExtension.groovy
@@ -49,6 +49,14 @@ class VersioningExtension {
     String scm = 'git'

     /**
+     * Allow setting location of .git file for non conventional git/gradle setups.
+     * This is the path to the .git folder used to validate if git is present for the current
+     * project.
+     *
+     */
+    String dotgitPath = null
+
+    /**
      * Fetch the branch from environment variable if available.
      *
      * By default, the environment is not taken into account, in order to be backward compatible
diff --git a/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy b/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy
index 56881b4..90654b4 100644
--- a/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy
+++ b/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy
@@ -19,7 +19,9 @@ class GitInfoService implements SCMInfoService {
     @Override
     SCMInfo getInfo(Project project, VersioningExtension extension) {
         // Is Git enabled?
-        boolean hasGit = project.rootProject.file('.git').exists()
+        boolean hasGit = project.rootProject.file('.git').exists() ||
+                         project.file('.git').exists() ||
+                         (extension.dotgitPath != null && new File(extension.dotgitPath).exists())
         // No Git information
         if (!hasGit) {
             SCMInfo.NONE

`

[dcoraboeuf]

Looks like a good patch. I'll need to create some integration test first. I'll do that later today or this week-end. You can also jump in and try to create a PR.

[domcc]

Great thanks Damien. First time creating a PR on github so i will work it out when i get home.

[domcc]

Hi Damien, managed to create a pull request #38

Thank you,
Dominic

[dcoraboeuf]

Closing this ticket in favour of the pull request.