From 702c995d48ee8df72b0803bc5c7a366463d7872e Mon Sep 17 00:00:00 2001
From: Erik Krogen <erikkrogen@gmail.com>
Date: Mon, 26 Jun 2023 12:47:25 -0700
Subject: [PATCH] Fix build inside git worktrees by working around
 git-commit-id #639

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9f02e03d83e9..7ae22a9195ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2105,6 +2105,9 @@
                         <injectAllReactorProjects>true</injectAllReactorProjects>
                         <!-- A workaround to make build work in a Git worktree, see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215 -->
                         <useNativeGit>true</useNativeGit>
+                        <!-- git-commit-id 6.0.0 incorrectly detects the .git dir, breaking the native-git workaround; see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/639 -->
+                        <!-- When Maven 4.0 is used, this can be replaced by a native Maven property (see MNG-7038), assuming git-commit-id #639 isn't yet fixed -->
+                        <dotGitDirectory>${air.main.basedir}/.git</dotGitDirectory>
                     </configuration>
                 </plugin>
                 <plugin>