make the GitDirLocator return the directory where both implementations can collect their results (e.g. the parent directory for the NativeGitImplementation)

Author: TheSnoozer

src/main/java/pl/project13/core/GitCommitIdPlugin.java

@@ -344,7 +344,11 @@ protected static void loadGitData(@Nonnull Callback cb, @Nonnull Properties prop
       throw new GitCommitIdExecutionException("suspicious argument for evaluateOnCommit, aborting execution!");
     }
 
-    File dotGitDirectory = findDotGitDirectory(cb);
+    File dotGitDirectory = new GitDirLocator(
+        cb.getProjectBaseDir(),
+        cb.useNativeGit(),
+        cb.shouldFailOnNoGitDirectory()
+    ).lookupGitDirectory(cb.getDotGitDirectory());
     if (dotGitDirectory != null) {
       cb.getLogInterface().info("dotGitDirectory '" + dotGitDirectory.getAbsolutePath() + "'");
     } else {
@@ -359,25 +363,12 @@ protected static void loadGitData(@Nonnull Callback cb, @Nonnull Properties prop
     }
   }
 
-  /**
-   * Find the git directory of the currently used project. If it's not already specified, this
-   * method will try to find it.
-   *
-   * @return the File representation of the .git directory
-   */
-  private static File findDotGitDirectory(@Nonnull Callback cb) throws GitCommitIdExecutionException {
-    return new GitDirLocator(
-      cb.getProjectBaseDir(),
-      cb.shouldFailOnNoGitDirectory()
-    ).lookupGitDirectory(cb.getDotGitDirectory());
-  }
-
   private static void loadGitDataWithNativeGit(
       @Nonnull Callback cb,
       @Nonnull File dotGitDirectory,
       @Nonnull Properties properties) throws GitCommitIdExecutionException {
     GitDataProvider nativeGitProvider = NativeGitProvider
-            .on(dotGitDirectory.getParentFile(), cb.getNativeGitTimeoutInMs(), cb.getLogInterface())
+            .on(dotGitDirectory, cb.getNativeGitTimeoutInMs(), cb.getLogInterface())
             .setPrefixDot(cb.getPrefixDot())
             .setAbbrevLength(cb.getAbbrevLength())
             .setDateFormat(cb.getDateFormat())

src/main/java/pl/project13/core/util/GitDirLocator.java

@@ -33,16 +33,27 @@
  */
 public class GitDirLocator {
   final File projectBasedir;
+  final boolean useNativeGit;
   final boolean shouldFailOnNoGitDirectory;
 
   /**
    * Constructor to encapsulates all references required to locate a valid .git directory
    *
    * @param projectBasedir The project basedir that will be used as last resort to search
    *                       the parent project hierarchy until a .git directory is found.
+   * @param useNativeGit Boolean that indicates if we use the native git implementation or the
+   *                     jGit Implementation. For the native git we usually need to
+   *                     use the parent "git"-Folder, as git can not run commands
+   *                     in "your-project/.git".
+   * @param shouldFailOnNoGitDirectory Boolean that indicates if the process should fail if no
+   *                                   git directory can be found.
    */
-  public GitDirLocator(File projectBasedir, boolean shouldFailOnNoGitDirectory) {
+  public GitDirLocator(
+      File projectBasedir,
+      boolean useNativeGit,
+      boolean shouldFailOnNoGitDirectory) {
     this.projectBasedir = projectBasedir;
+    this.useNativeGit = useNativeGit;
     this.shouldFailOnNoGitDirectory = shouldFailOnNoGitDirectory;
   }
 
@@ -63,6 +74,9 @@ public File lookupGitDirectory(@Nonnull File manuallyConfiguredDir) throws GitCo
         ".git directory is not found! Please specify a valid [dotGitDirectory] in your"
           + " project");
     }
+    if (useNativeGit) {
+      dotGitDirectory = dotGitDirectory.getParentFile();
+    }
     return dotGitDirectory;
   }
 

src/test/java/pl/project13/core/util/GitDirLocatorTest.java

@@ -38,7 +38,7 @@ public void shouldUseTheManuallySpecifiedDirectory() throws Exception {
     File dotGitDir = folder.newFolder("temp");
     try {
       // when
-      GitDirLocator locator = new GitDirLocator(dotGitDir, true);
+      GitDirLocator locator = new GitDirLocator(dotGitDir, false, true);
       File foundDirectory = locator.lookupGitDirectory(dotGitDir);
 
       // then
@@ -71,7 +71,7 @@ public void shouldResolveRelativeSubmodule() throws Exception {
 
     try {
       // when
-      GitDirLocator locator = new GitDirLocator(dotGitDir, true);
+      GitDirLocator locator = new GitDirLocator(dotGitDir, false, true);
       File foundDirectory = locator.lookupGitDirectory(dotGitDir);
 
       // then