From 4c1cfe52f2f8a4dc0b0cea915a5cb47e4c1f8666 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc.git.dev@mro.slmail.me>
Date: Sat, 21 Sep 2024 19:26:36 +0200
Subject: [PATCH 1/8] Implement distanceOrZero to have 0 instead of depth when
 tag is not found

---
 .../gitversioning/commons/GitDescription.java |  8 ++++++-
 .../qoomon/gitversioning/commons/GitUtil.java |  6 ++---
 .../GitVersioningModelProcessor.java          | 22 ++++++++++++-------
 .../gitversioning/commons/GitUtilTest.java    | 19 +++++++++++++++-
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java b/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
index 34499987..6a3222e4 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
@@ -4,11 +4,13 @@ public class GitDescription {
     private final String commit;
     private final String tag;
     private final int distance;
+    private final boolean foundTag;
 
-    public GitDescription(String commit, String tag, int distance) {
+    public GitDescription(String commit, String tag, int distance, boolean foundTag) {
         this.commit = commit;
         this.tag = tag;
         this.distance = distance;
+        this.foundTag = foundTag;
     }
 
     public String getCommit() {
@@ -23,6 +25,10 @@ public int getDistance() {
         return distance;
     }
 
+    public int getDistanceOrZero() {
+        return foundTag ? distance : 0;
+    }
+
     @Override
     public String toString() {
         return tag + "-" + distance + "-g" + commit.substring(0,7);
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 77ed29f3..1b185f09 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -53,7 +53,7 @@ public static List<String> tagsPointAt(ObjectId revObjectId, Repository reposito
     public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository, boolean firstParent) throws IOException {
         Repository commonRepository = worktreesFix_getCommonRepository(repository);
         if (revObjectId == null) {
-            return new GitDescription(NO_COMMIT, "root", 0);
+            return new GitDescription(NO_COMMIT, "root", 0, false);
         }
 
         Map<ObjectId, List<String>> objectIdListMap = reverseTagRefMap(repository);
@@ -72,7 +72,7 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
                         .findFirst();
 
                 if (matchingTag.isPresent()) {
-                    return new GitDescription(revObjectId.getName(), matchingTag.get(), depth);
+                    return new GitDescription(revObjectId.getName(), matchingTag.get(), depth, true);
                 }
                 depth++;
             }
@@ -81,7 +81,7 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
                 throw new IllegalStateException("couldn't find matching tag in shallow git repository");
             }
 
-            return new GitDescription(revObjectId.getName(), "root", depth);
+            return new GitDescription(revObjectId.getName(), "root", depth, false);
         }
     }
 
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 28c90f98..844c7432 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -966,14 +966,9 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), 1)));
 
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
-        placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(descriptionDistance.get())));
-        placeholderMap.put("describe.distance.snapshot", Lazy.by(() -> (descriptionDistance.get() == 0 ? "" : "-SNAPSHOT")));
-
-        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get())));
-        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
-
-        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), descriptionDistance.get())));
-        placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
+        setDescribeDistancePlaceholders(placeholderMap, descriptionDistance, "distance");
+        final Lazy<Integer> descriptionDistanceOrZero = Lazy.by(() -> description.get().getDistanceOrZero());
+        setDescribeDistancePlaceholders(placeholderMap, descriptionDistanceOrZero, "distanceOrZero");
 
         // describe tag pattern groups
         final Lazy<Map<String, String>> describeTagPatternValues = Lazy.by(
@@ -1002,6 +997,17 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         return placeholderMap;
     }
 
+    private static void setDescribeDistancePlaceholders(Map<String, Supplier<String>> placeholderMap, Lazy<Integer> descriptionDistance, String distanceName) {
+        placeholderMap.put("describe." + distanceName, Lazy.by(() -> String.valueOf(descriptionDistance.get())));
+        placeholderMap.put("describe." + distanceName + ".snapshot", Lazy.by(() -> (descriptionDistance.get() == 0 ? "" : "-SNAPSHOT")));
+
+        placeholderMap.put("describe.tag.version.patch.plus.describe." + distanceName, Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get())));
+        placeholderMap.put("describe.tag.version.patch.next.plus.describe." + distanceName, Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
+
+        placeholderMap.put("describe.tag.version.label.plus.describe." + distanceName, Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), descriptionDistance.get())));
+        placeholderMap.put("describe.tag.version.label.next.plus.describe." + distanceName, Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
+    }
+
     private Matcher matchVersion(String input) {
         Matcher matcher = VERSION_PATTERN.matcher(input);
         //noinspection ResultOfMethodCallIgnored
diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 5aed5d23..679ace1f 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -1,6 +1,7 @@
 package me.qoomon.gitversioning.commons;
 
 
+import org.assertj.core.api.SoftAssertions;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -16,6 +17,7 @@
 import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.eclipse.jgit.lib.Constants.MASTER;
 
@@ -192,9 +194,24 @@ void describe() throws Exception {
         // then
         assertThat(description).satisfies(it -> {
             assertThat(it.getCommit()).isEqualTo(givenCommit.getName());
-            assertThat(it.getDistance()).isEqualTo(0);
+            assertThat(it.getDistance()).isZero();
+            assertThat(it.getDistanceOrZero()).isZero();
             assertThat(it.getTag()).isEqualTo(givenTagName);
         });
     }
 
+    @Test
+    void distanceOrZeroIsZeroWhenNoTagMatches() throws Exception {
+        // given
+        Git git = Git.init().setInitialBranch(MASTER).setDirectory(tempDir.toFile()).call();
+
+        final var softly = new SoftAssertions();
+        for (int i = 0; i < 3; ++i) {
+            GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true);
+            softly.assertThat(description.getDistanceOrZero()).isZero();
+            softly.assertThat(description.getDistance()).isEqualTo(i);
+            git.commit().setMessage("commit " + (i + 1)).setAllowEmpty(true).call();
+        }
+        softly.assertAll();
+    }
 }

From e9f82b41b9a3d4a5870cfe08d6cb2fc1b351cc96 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc@rozanc.fr>
Date: Sun, 22 Sep 2024 02:10:51 +0200
Subject: [PATCH 2/8] Update documentation

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 8b2a4af8..af8fb45f 100644
--- a/README.md
+++ b/README.md
@@ -236,7 +236,9 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 
 - `${describe}` Will resolve to `git describe` output
 - `${describe.distance}` The distance count to last matching tag
+- `${describe.distanceOrZero}` The distance count to last matching tag or 0 if no tag is found
 - `${describe.distance.snapshot}` Empty string on matching tag, `-SNAPSHOT` if `describe.distance > 0` 
+- `${describe.distanceOrZero.snapshot}` Empty string on matching tag, `-SNAPSHOT` if `describe.distanceOrZero > 0` 
 - `${describe.tag}` The matching tag of `git describe`
   - `${describe.tag.version}` the tag version determined by regex `(?<version>(?<core>(?<major>\d+)(?:\.(?<minor>\d+)(?:\.(?<patch>\d+))?)?)(?:-(?<label>.*))?)`
     - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
@@ -247,11 +249,15 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${describe.tag.version.patch}` the patch version component of `${describe.tag.version}` e.g. '3'
       - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
       - `${describe.tag.version.patch.plus.describe.distance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` e.g. '2'
+      - `${describe.tag.version.patch.plus.describe.distanceOrZero}` the `${describe.tag.version.patch}` increased by `${describe.distanceOrZero}` e.g. '2'
       - `${describe.tag.version.patch.next.plus.describe.distance}` the `${describe.tag.version.patch.next}` increased by `${describe.distance}` e.g. '3'
+      - `${describe.tag.version.patch.next.plus.describe.distanceOrZero}` the `${describe.tag.version.patch.next}` increased by `${describe.distanceOrZero}` e.g. '3'
     - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
       - `${describe.tag.version.label.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
       - `${describe.tag.version.label.plus.describe.distance}` the `${describe.tag.version.label}` increased by `${describe.distance}` e.g. '2'
+      - `${describe.tag.version.label.plus.describe.distanceOrZero}` the `${describe.tag.version.label}` increased by `${describe.distanceOrZero}` e.g. '2'
       - `${describe.tag.version.label.next.plus.describe.distance}` the `${describe.tag.version.label.next}` increased by `${describe.distance}` e.g. '3'
+      - `${describe.tag.version.label.next.plus.describe.distanceOrZero}` the `${describe.tag.version.label.next}` increased by `${describe.distanceOrZero}` e.g. '3'
 - Describe Tag Pattern Groups
     - Content of regex groups in `<describeTagPattern>` can be addressed like this:
     - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`

From b094b9866632643d8fa6fbf1ab8f4bb2ab2eeed4 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc.git.dev@mro.slmail.me>
Date: Sun, 22 Sep 2024 14:52:21 +0200
Subject: [PATCH 3/8] Rename boolean for foundTag and add getter

---
 .../qoomon/gitversioning/commons/GitDescription.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java b/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
index 6a3222e4..c593da48 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitDescription.java
@@ -4,13 +4,13 @@ public class GitDescription {
     private final String commit;
     private final String tag;
     private final int distance;
-    private final boolean foundTag;
+    private final boolean tagFound;
 
-    public GitDescription(String commit, String tag, int distance, boolean foundTag) {
+    public GitDescription(String commit, String tag, int distance, boolean tagFound) {
         this.commit = commit;
         this.tag = tag;
         this.distance = distance;
-        this.foundTag = foundTag;
+        this.tagFound = tagFound;
     }
 
     public String getCommit() {
@@ -21,12 +21,16 @@ public String getTag() {
         return tag;
     }
 
+    public boolean isTagFound() {
+        return tagFound;
+    }
+
     public int getDistance() {
         return distance;
     }
 
     public int getDistanceOrZero() {
-        return foundTag ? distance : 0;
+        return tagFound ? distance : 0;
     }
 
     @Override

From b9bd8211d7f952ad41e24050b669a8df77cb5086 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc.git.dev@mro.slmail.me>
Date: Sun, 22 Sep 2024 15:06:27 +0200
Subject: [PATCH 4/8] Add describeTagMaxDepth config to limit the repository
 scan

In case we have a more specific tag pattern to search on a branch,
 and this pattern does not match any tag in the branch, it's preferable
 to have a limit to the describe search for performance reasons.
---
 README.md                                     | 10 +-
 docs/configuration-9.8.2.xsd                  | 95 +++++++++++++++++++
 docs/example-configuration.xml                | 39 ++++----
 .../gitversioning/commons/GitSituation.java   | 10 +-
 .../qoomon/gitversioning/commons/GitUtil.java |  5 +-
 .../maven/gitversioning/Configuration.java    |  5 +
 .../GitVersioningModelProcessor.java          |  5 +-
 .../gitversioning/commons/GitUtilTest.java    | 25 ++++-
 8 files changed, 161 insertions(+), 33 deletions(-)
 create mode 100644 docs/configuration-9.8.2.xsd

diff --git a/README.md b/README.md
index af8fb45f..e40052da 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ You can configure the version and properties adjustments for specific branches a
 ```xml
 <configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-9.4.0.xsd">
+               xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-9.8.2.xsd">
 
     <refs>
         <ref type="branch">
@@ -93,6 +93,10 @@ You can configure the version and properties adjustments for specific branches a
   - has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
 - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
   - default is `true`
+- `<describeTagMaxDepth>` An integer that describes the maximum number of commits to scan in search of a tag matching
+  `<describeTagPattern>`.
+  - By default, it is set to `Integer.MAX_VALUE`.
+  - For convenience, any strictly negative value will also remove the limitation.
 
 - `<updatePom>` Enable(`true`)/disable(`false`) version and properties update in original pom file, default is `false`
   - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
@@ -114,6 +118,10 @@ You can configure the version and properties adjustments for specific branches a
         - will override global `<describeTagPattern>` value
       - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
         - default is `true`
+      - `<describeTagMaxDepth>` An integer that describes the maximum number of commits to scan in search of a tag matching
+        `<describeTagPattern>`.
+        - By default, it is set to `Integer.MAX_VALUE`.
+        - For convenience, any strictly negative value will also remove the limitation.
           <br><br>
         
       - `<version>` The new version format, see [Format Placeholders](#format-placeholders)
diff --git a/docs/configuration-9.8.2.xsd b/docs/configuration-9.8.2.xsd
new file mode 100644
index 00000000..0724ef7f
--- /dev/null
+++ b/docs/configuration-9.8.2.xsd
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xs:schema xmlns="https://github.com/qoomon/maven-git-versioning-extension"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="https://github.com/qoomon/maven-git-versioning-extension"
+           elementFormDefault="qualified">
+
+    <xs:element name="configuration">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="disable" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="projectVersionPattern" type="xs:string" minOccurs="0"/>
+
+                <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+                <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
+                <xs:element name="describeTagMaxDepth" type="xs:int" minOccurs="0"/>
+                <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="refs" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="ref" type="RefPatchDescription" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+
+                        <xs:attribute name="considerTagsOnBranches" type="xs:boolean"/>
+                    </xs:complexType>
+                </xs:element>
+
+                <xs:element name="rev" type="PatchDescription" minOccurs="0"/>
+
+                <xs:element name="relatedProjects" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="project" type="RelatedProject" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="PatchDescription">
+        <xs:all>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+    </xs:complexType>
+
+    <xs:complexType name="RefPatchDescription">
+        <xs:all>
+            <xs:element name="pattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagMaxDepth" type="xs:int" minOccurs="0"/>
+            <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+
+        <xs:attribute name="type" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="tag"/>
+                    <xs:enumeration value="branch"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="RelatedProject">
+        <xs:all>
+            <xs:element name="groupId" type="xs:string"/>
+            <xs:element name="artifactId" type="xs:string"/>
+        </xs:all>
+    </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/docs/example-configuration.xml b/docs/example-configuration.xml
index 3585c5af..f0638083 100644
--- a/docs/example-configuration.xml
+++ b/docs/example-configuration.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-6.4.0.xsd">
+               xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-9.8.2.xsd">
 
     <disable>false</disable>
     <updatePom>false</updatePom>
-    <preferTags>false</preferTags>
+    <describeTagMaxDepth>100</describeTagMaxDepth>
 
-    <branch>
-        <pattern>.*</pattern>
-        <versionFormat>${branch}-SNAPSHOT</versionFormat>
-        <property>
-            <name>name</name>
-            <valueFormat>value</valueFormat>
-        </property>
-        <property>
-            <name>name</name>
-            <valueFormat>value</valueFormat>
-        </property>
-    </branch>
+    <refs considerTagsOnBranches="true">
+        <ref type="tag">
+            <pattern>v(.*)</pattern>
+            <version>${ref.1}</version>
+        </ref>
 
-    <tag>
-        <pattern>v(.*)</pattern>
-        <versionFormat>${1}</versionFormat>
-    </tag>
+        <ref type="branch">
+            <pattern>.*</pattern>
+            <version>${ref}</version>
+            <properties>
+                <name>value</name>
+            </properties>
+        </ref>
+    </refs>
 
-    <commit>
-        <versionFormat>${commit}</versionFormat>
-    </commit>
+    <rev>
+        <version>${commit}</version>
+    </rev>
 
 </configuration>
\ No newline at end of file
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
index a22ab8e9..4ff7f43a 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
@@ -36,7 +36,7 @@ public class GitSituation {
 
     private boolean firstParent = true;
 
-    private Supplier<GitDescription> description = Lazy.by(this::describe);
+    private Supplier<GitDescription> description = Lazy.by(() -> this.describe(Integer.MAX_VALUE));
 
     public GitSituation(Repository repository) throws IOException {
         this.repository = repository;
@@ -121,9 +121,9 @@ public boolean isClean() {
         return clean.get();
     }
 
-    public void setDescribeTagPattern(Pattern describeTagPattern) {
+    public void setDescribeTagPattern(Pattern describeTagPattern, Integer describeTagMaxDepth) {
         this.describeTagPattern = requireNonNull(describeTagPattern);
-        this.description = Lazy.by(this::describe);
+        this.description = Lazy.by(() -> this.describe(describeTagMaxDepth));
     }
 
     public Pattern getDescribeTagPattern() {
@@ -162,7 +162,7 @@ private boolean clean() throws GitAPIException {
         return GitUtil.status(repository).isClean();
     }
 
-    private GitDescription describe() throws IOException {
-        return GitUtil.describe(head, describeTagPattern, repository, firstParent);
+    private GitDescription describe(Integer maxDepth) throws IOException {
+        return GitUtil.describe(head, describeTagPattern, repository, firstParent, maxDepth);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 1b185f09..10f5aeca 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -50,7 +50,7 @@ public static List<String> tagsPointAt(ObjectId revObjectId, Repository reposito
         return reverseTagRefMap(repository).getOrDefault(revObjectId, emptyList());
     }
 
-    public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository, boolean firstParent) throws IOException {
+    public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository, boolean firstParent, Integer maxDepth) throws IOException {
         Repository commonRepository = worktreesFix_getCommonRepository(repository);
         if (revObjectId == null) {
             return new GitDescription(NO_COMMIT, "root", 0, false);
@@ -64,8 +64,9 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
             walk.setFirstParent(firstParent);
             walk.markStart(walk.parseCommit(revObjectId));
             Iterator<RevCommit> walkIterator = walk.iterator();
+            final int positiveMaxDepth = maxDepth == null || maxDepth < 0 ? Integer.MAX_VALUE : maxDepth;
             int depth = 0;
-            while (walkIterator.hasNext()) {
+            while (walkIterator.hasNext() && depth < positiveMaxDepth) {
                 RevCommit rev = walkIterator.next();
                 Optional<String> matchingTag = objectIdListMap.getOrDefault(rev, emptyList()).stream()
                         .filter(tag -> tagPattern.matcher(tag).matches())
diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index a9b8a929..c46ec2ab 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -55,6 +55,8 @@ public Pattern describeTagPattern() {
         return Pattern.compile(describeTagPattern);
     }
 
+    public Integer describeTagMaxDepth = Integer.MAX_VALUE;
+
     public Boolean updatePom = false;
 
     public RefPatchDescriptionList refs = new RefPatchDescriptionList();
@@ -79,6 +81,8 @@ public Pattern describeTagPattern() {
             return Pattern.compile(describeTagPattern);
         }
 
+        public Integer describeTagMaxDepth;
+
         @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
         public String version;
 
@@ -120,6 +124,7 @@ public RefPatchDescription(GitRefType type, Pattern pattern, PatchDescription de
             this.type = type;
             this.pattern = pattern != null ? pattern.pattern() : null;
             this.describeTagPattern = description.describeTagPattern;
+            this.describeTagMaxDepth = description.describeTagMaxDepth;
             this.updatePom = description.updatePom;
             this.describeTagFirstParent = description.describeTagFirstParent;
             this.version = description.version;
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 844c7432..020c8532 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -230,7 +230,7 @@ private void init(Model projectModel) throws IOException {
         logger.info("ref configuration: {} - pattern: {}", gitVersionDetails.getRefType().name(), patchDescription.pattern);
         if (patchDescription.describeTagPattern != null && !patchDescription.describeTagPattern.equals(".*")) {
             logger.info("  describeTagPattern: {}", patchDescription.describeTagPattern);
-            gitSituation.setDescribeTagPattern(patchDescription.describeTagPattern());
+            gitSituation.setDescribeTagPattern(patchDescription.describeTagPattern(), patchDescription.describeTagMaxDepth);
         }
         if (patchDescription.describeTagFirstParent != null) {
             logger.info("  describeTagFirstParent: {}", patchDescription.describeTagFirstParent);
@@ -1048,6 +1048,9 @@ private static Configuration readConfig(File configFile) throws IOException {
             if (patchDescription.describeTagFirstParent == null) {
                 patchDescription.describeTagFirstParent = config.describeTagFirstParent;
             }
+            if (patchDescription.describeTagMaxDepth == null) {
+                patchDescription.describeTagMaxDepth = config.describeTagMaxDepth;
+            }
             if (patchDescription.updatePom == null) {
                 patchDescription.updatePom = config.updatePom;
             }
diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 679ace1f..368273b4 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -17,7 +17,6 @@
 import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.SoftAssertions.assertSoftly;
 import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.eclipse.jgit.lib.Constants.MASTER;
 
@@ -189,7 +188,7 @@ void describe() throws Exception {
         git.tag().setName(givenTagName).setAnnotated(true).setObjectId(givenCommit).setMessage(".").call();
 
         // when
-        GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true);
+        GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true, -1);
 
         // then
         assertThat(description).satisfies(it -> {
@@ -207,11 +206,31 @@ void distanceOrZeroIsZeroWhenNoTagMatches() throws Exception {
 
         final var softly = new SoftAssertions();
         for (int i = 0; i < 3; ++i) {
-            GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true);
+            GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true, -1);
+            softly.assertThat(description.isTagFound()).isFalse();
             softly.assertThat(description.getDistanceOrZero()).isZero();
             softly.assertThat(description.getDistance()).isEqualTo(i);
             git.commit().setMessage("commit " + (i + 1)).setAllowEmpty(true).call();
         }
         softly.assertAll();
     }
+
+    @Test
+    void distanceWithMaxDepth() throws Exception {
+        // given
+        final int maxDepth = 4;
+        Git git = Git.init().setInitialBranch(MASTER).setDirectory(tempDir.toFile()).call();
+        final RevCommit firstCommit = git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+        git.tag().setName("v1.0.0").setAnnotated(true).setObjectId(firstCommit).setMessage(".").call();
+
+        final SoftAssertions softly = new SoftAssertions();
+        for (int i = 0; i < 6; ++i) {
+            GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true, maxDepth);
+            softly.assertThat(description.isTagFound()).as("distanceOrZero " + i).isEqualTo(i < maxDepth);
+            softly.assertThat(description.getDistanceOrZero()).as("distanceOrZero " + i).isEqualTo(i >= maxDepth ? 0 : i);
+            softly.assertThat(description.getDistance()).as("distance " + i).isEqualTo(Math.min(i, maxDepth));
+            git.commit().setMessage("commit " + (i + 1)).setAllowEmpty(true).call();
+        }
+        softly.assertAll();
+    }
 }

From 4731084a84cd288df698b14c704b7e08f7cf1cb7 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc.git.dev@mro.slmail.me>
Date: Sun, 22 Sep 2024 18:32:21 +0200
Subject: [PATCH 5/8] Fix distance implementation with multiple parents

As the implementation was a counter, when visiting many parents without resetting the counter,
the returned distance was not correct.

Using the DepthWalk.RevWalk has two benefits:
 - it can limit the depths
 - it allows accessing the depth of the current commit instead of trying to do it with custom code
---
 .../qoomon/gitversioning/commons/GitUtil.java | 26 ++++++----
 .../gitversioning/commons/GitUtilTest.java    | 52 +++++++++++++++++--
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 10f5aeca..3d382711 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -5,6 +5,7 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.NoWorkTreeException;
 import org.eclipse.jgit.lib.*;
+import org.eclipse.jgit.revwalk.DepthWalk;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
@@ -14,11 +15,9 @@
 import java.nio.file.Files;
 import java.time.Instant;
 import java.time.ZonedDateTime;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -58,16 +57,22 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
 
         Map<ObjectId, List<String>> objectIdListMap = reverseTagRefMap(repository);
 
+        final int positiveMaxDepth = maxDepth == null || maxDepth < 0 ? Integer.MAX_VALUE : maxDepth;
         // Walk back commit ancestors looking for tagged one
-        try (RevWalk walk = new RevWalk(commonRepository)) {
+        try (DepthWalk.RevWalk walk = new DepthWalk.RevWalk(commonRepository, positiveMaxDepth)) {
             walk.setRetainBody(false);
             walk.setFirstParent(firstParent);
-            walk.markStart(walk.parseCommit(revObjectId));
+            final RevCommit startCommit = walk.parseCommit(revObjectId);
+            walk.markRoot(startCommit);
             Iterator<RevCommit> walkIterator = walk.iterator();
-            final int positiveMaxDepth = maxDepth == null || maxDepth < 0 ? Integer.MAX_VALUE : maxDepth;
-            int depth = 0;
-            while (walkIterator.hasNext() && depth < positiveMaxDepth) {
+            int maxVisitedDepth = 0;
+            while (walkIterator.hasNext()) {
                 RevCommit rev = walkIterator.next();
+                int depth = 0;
+                if (rev instanceof DepthWalk.Commit) {
+                    depth = ((DepthWalk.Commit) rev).getDepth();
+                }
+                maxVisitedDepth = Math.max(maxVisitedDepth, depth);
                 Optional<String> matchingTag = objectIdListMap.getOrDefault(rev, emptyList()).stream()
                         .filter(tag -> tagPattern.matcher(tag).matches())
                         .findFirst();
@@ -75,14 +80,13 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
                 if (matchingTag.isPresent()) {
                     return new GitDescription(revObjectId.getName(), matchingTag.get(), depth, true);
                 }
-                depth++;
             }
 
             if (isShallowRepository(repository)) {
                 throw new IllegalStateException("couldn't find matching tag in shallow git repository");
             }
 
-            return new GitDescription(revObjectId.getName(), "root", depth, false);
+            return new GitDescription(revObjectId.getName(), "root", maxVisitedDepth, false);
         }
     }
 
diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 368273b4..11555add 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -3,6 +3,7 @@
 
 import org.assertj.core.api.SoftAssertions;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.MergeCommand;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
@@ -203,13 +204,14 @@ void describe() throws Exception {
     void distanceOrZeroIsZeroWhenNoTagMatches() throws Exception {
         // given
         Git git = Git.init().setInitialBranch(MASTER).setDirectory(tempDir.toFile()).call();
+        git.commit().setMessage("initial commit").setAllowEmpty(true).call();
 
         final var softly = new SoftAssertions();
         for (int i = 0; i < 3; ++i) {
             GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true, -1);
-            softly.assertThat(description.isTagFound()).isFalse();
-            softly.assertThat(description.getDistanceOrZero()).isZero();
-            softly.assertThat(description.getDistance()).isEqualTo(i);
+            softly.assertThat(description.isTagFound()).as("isTagFound " + i).isFalse();
+            softly.assertThat(description.getDistanceOrZero()).as("distanceOrZero " + i).isZero();
+            softly.assertThat(description.getDistance()).as("distance " + i).isEqualTo(i);
             git.commit().setMessage("commit " + (i + 1)).setAllowEmpty(true).call();
         }
         softly.assertAll();
@@ -226,11 +228,51 @@ void distanceWithMaxDepth() throws Exception {
         final SoftAssertions softly = new SoftAssertions();
         for (int i = 0; i < 6; ++i) {
             GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true, maxDepth);
-            softly.assertThat(description.isTagFound()).as("distanceOrZero " + i).isEqualTo(i < maxDepth);
-            softly.assertThat(description.getDistanceOrZero()).as("distanceOrZero " + i).isEqualTo(i >= maxDepth ? 0 : i);
+            softly.assertThat(description.isTagFound()).as("distanceOrZero " + i).isEqualTo(i <= maxDepth);
+            softly.assertThat(description.getDistanceOrZero()).as("distanceOrZero " + i).isEqualTo(i > maxDepth ? 0 : i);
             softly.assertThat(description.getDistance()).as("distance " + i).isEqualTo(Math.min(i, maxDepth));
             git.commit().setMessage("commit " + (i + 1)).setAllowEmpty(true).call();
         }
         softly.assertAll();
     }
+
+    @Test
+    void distanceWithManyParents() throws Exception {
+        // give
+        Git git = Git.init().setInitialBranch("A").setDirectory(tempDir.toFile()).call();
+        final RevCommit firstCommit = git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+        git.tag().setName("v1.0.0").setAnnotated(true).setObjectId(firstCommit).setMessage(".").call();
+        final RevCommit commitBranchAWithTag = git.commit().setMessage("commit branch 1 with tag").setAllowEmpty(true).call();
+        git.tag().setName("v1.1.0").setAnnotated(true).setObjectId(commitBranchAWithTag).setMessage(".").call();
+        for (int i = 0; i < 10; ++i) {
+            git.commit().setMessage("commit branch A " + (i + 1)).setAllowEmpty(true).call();
+        }
+
+        git.checkout().setCreateBranch(true).setName("B").setStartPoint(firstCommit).call();
+        final RevCommit commitBranchBWithTag = git.commit().setMessage("commit branch B with tag").setAllowEmpty(true).call();
+        git.tag().setName("v1.2.0").setAnnotated(true).setObjectId(commitBranchBWithTag).setMessage(".").call();
+        for (int i = 0; i < 5; ++i) {
+            git.commit().setMessage("commit branch B " + (i + 1)).setAllowEmpty(true).call();
+        }
+        git.merge().include(git.getRepository().resolve("A")).setFastForward(MergeCommand.FastForwardMode.NO_FF).call();
+
+        // When
+        GitDescription description10 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), false, null);
+        GitDescription description11 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), false, -1);
+        GitDescription description12 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), false, -1);
+        final int maxDepth = 8;
+        GitDescription description10Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), false, maxDepth);
+        GitDescription description11Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), false, maxDepth);
+        GitDescription description12Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), false, maxDepth);
+
+        // Then
+        final SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(description10.getDistance()).as("v1.0.0 distance").isEqualTo(7);
+        softly.assertThat(description11.getDistance()).as("v1.1.0 distance").isEqualTo(11);
+        softly.assertThat(description12.getDistance()).as("v1.2.0 distance").isEqualTo(6);
+        softly.assertThat(description10Depth.getDistance()).as("v1.0.0 distance with depth").isEqualTo(7);
+        softly.assertThat(description11Depth.getDistance()).as("v1.1.0 distance with depth").isEqualTo(8);
+        softly.assertThat(description12Depth.getDistance()).as("v1.2.0 distance with depth").isEqualTo(6);
+        softly.assertAll();
+    }
 }

From 92618f7d5dbc5025d1d9bd72459cb7c391ddd410 Mon Sep 17 00:00:00 2001
From: Marc ROZANC <marc.git.dev@mro.slmail.me>
Date: Sun, 22 Sep 2024 19:42:57 +0200
Subject: [PATCH 6/8] Integration test fixes

 - Tags at same depth: no logic implemented to specify which one is selected, so I put one
  more commit in the test to have different depths.
 - Version from label=0 plus distance=0 (single commit, no tag), not sure why the test was expecting "1" as a version.
---
 .../gitversioning/commons/GitUtilTest.java    | 66 +++++++++++++++++--
 .../GitVersioningExtensionIT.java             |  5 +-
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 11555add..60539cc0 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -257,22 +257,76 @@ void distanceWithManyParents() throws Exception {
         git.merge().include(git.getRepository().resolve("A")).setFastForward(MergeCommand.FastForwardMode.NO_FF).call();
 
         // When
-        GitDescription description10 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), false, null);
-        GitDescription description11 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), false, -1);
-        GitDescription description12 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), false, -1);
+        final boolean firstParent = false;
+        GitDescription description10 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), firstParent, null);
+        GitDescription description11 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), firstParent, -1);
+        GitDescription description12 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), firstParent, -1);
         final int maxDepth = 8;
-        GitDescription description10Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), false, maxDepth);
-        GitDescription description11Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), false, maxDepth);
-        GitDescription description12Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), false, maxDepth);
+        GitDescription description10Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), firstParent, maxDepth);
+        GitDescription description11Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), firstParent, maxDepth);
+        GitDescription description12Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), firstParent, maxDepth);
 
         // Then
         final SoftAssertions softly = new SoftAssertions();
         softly.assertThat(description10.getDistance()).as("v1.0.0 distance").isEqualTo(7);
+        softly.assertThat(description10.isTagFound()).as("v1.0.0 tagFound").isTrue();
         softly.assertThat(description11.getDistance()).as("v1.1.0 distance").isEqualTo(11);
+        softly.assertThat(description11.isTagFound()).as("v1.1.0 tagFound").isTrue();
         softly.assertThat(description12.getDistance()).as("v1.2.0 distance").isEqualTo(6);
+        softly.assertThat(description12.isTagFound()).as("v1.2.0 tagFound").isTrue();
         softly.assertThat(description10Depth.getDistance()).as("v1.0.0 distance with depth").isEqualTo(7);
+        softly.assertThat(description10Depth.isTagFound()).as("v1.0.0 tagFound with depth").isTrue();
         softly.assertThat(description11Depth.getDistance()).as("v1.1.0 distance with depth").isEqualTo(8);
+        softly.assertThat(description11Depth.isTagFound()).as("v1.1.0 tagFound with depth").isFalse();
         softly.assertThat(description12Depth.getDistance()).as("v1.2.0 distance with depth").isEqualTo(6);
+        softly.assertThat(description12Depth.isTagFound()).as("v1.2.0 tagFound with depth").isTrue();
+        softly.assertAll();
+    }
+
+    @Test
+    void distanceWithManyParentsAndFirstParentOnly() throws Exception {
+        // give
+        Git git = Git.init().setInitialBranch("A").setDirectory(tempDir.toFile()).call();
+        final RevCommit firstCommit = git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+        git.tag().setName("v1.0.0").setAnnotated(true).setObjectId(firstCommit).setMessage(".").call();
+        final RevCommit commitBranchAWithTag = git.commit().setMessage("commit branch 1 with tag").setAllowEmpty(true).call();
+        git.tag().setName("v1.1.0").setAnnotated(true).setObjectId(commitBranchAWithTag).setMessage(".").call();
+        for (int i = 0; i < 10; ++i) {
+            git.commit().setMessage("commit branch A " + (i + 1)).setAllowEmpty(true).call();
+        }
+
+        git.checkout().setCreateBranch(true).setName("B").setStartPoint(firstCommit).call();
+        final RevCommit commitBranchBWithTag = git.commit().setMessage("commit branch B with tag").setAllowEmpty(true).call();
+        git.tag().setName("v1.2.0").setAnnotated(true).setObjectId(commitBranchBWithTag).setMessage(".").call();
+        for (int i = 0; i < 5; ++i) {
+            git.commit().setMessage("commit branch B " + (i + 1)).setAllowEmpty(true).call();
+        }
+        git.merge().include(git.getRepository().resolve("A")).setFastForward(MergeCommand.FastForwardMode.NO_FF).call();
+
+        // When
+        final boolean firstParent = true;
+        GitDescription description10 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), firstParent, null);
+        GitDescription description11 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), firstParent, -1);
+        GitDescription description12 = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), firstParent, -1);
+        final int maxDepth = 8;
+        GitDescription description10Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.0.0")), git.getRepository(), firstParent, maxDepth);
+        GitDescription description11Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.1.0")), git.getRepository(), firstParent, maxDepth);
+        GitDescription description12Depth = GitUtil.describe(head(git), Pattern.compile(Pattern.quote("v1.2.0")), git.getRepository(), firstParent, maxDepth);
+
+        // Then
+        final SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(description10.getDistance()).as("v1.0.0 distance").isEqualTo(7);
+        softly.assertThat(description10.isTagFound()).as("v1.0.0 tagFound").isTrue();
+        softly.assertThat(description11.getDistance()).as("v1.1.0 distance").isEqualTo(7);
+        softly.assertThat(description11.isTagFound()).as("v1.1.0 tagFound").isFalse();
+        softly.assertThat(description12.getDistance()).as("v1.2.0 distance").isEqualTo(6);
+        softly.assertThat(description12.isTagFound()).as("v1.2.0 tagFound").isTrue();
+        softly.assertThat(description10Depth.getDistance()).as("v1.0.0 distance with depth").isEqualTo(7);
+        softly.assertThat(description10Depth.isTagFound()).as("v1.0.0 tagFound with depth").isTrue();
+        softly.assertThat(description11Depth.getDistance()).as("v1.1.0 distance with depth").isEqualTo(7);
+        softly.assertThat(description11Depth.isTagFound()).as("v1.1.0 tagFound with depth").isFalse();
+        softly.assertThat(description12Depth.getDistance()).as("v1.2.0 distance with depth").isEqualTo(6);
+        softly.assertThat(description12Depth.isTagFound()).as("v1.2.0 tagFound with depth").isTrue();
         softly.assertAll();
     }
 }
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index 8ef08619..0a1cf69f 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -775,7 +775,7 @@ void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exce
             // Then
             System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
-            String expectedVersion = "1";
+            String expectedVersion = "0";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
 
             Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
@@ -924,8 +924,9 @@ private void apply_TagOnMerged(final boolean firstParent) throws Exception {
         try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
             RevCommit initialCommit = git.commit().setMessage("initial commit").setAllowEmpty(true).call();
             git.tag().setName("2.0.4-tag-on-initial").call();
-            git.commit().setMessage("commit on master").setAllowEmpty(true).call();
+            git.commit().setMessage("commit on master 1").setAllowEmpty(true).call();
             git.tag().setName(tagOnMaster).call();
+            git.commit().setMessage("commit on master 2").setAllowEmpty(true).call();
             git.checkout().setStartPoint(initialCommit).setCreateBranch(true).setName("branch").call();
             // make sure the commit on the branch is newer
             Thread.sleep(2000);

From 180bcb480bc29a22568367b8e82aa5c450c498dc Mon Sep 17 00:00:00 2001
From: Marc Rozanc <marc@rozanc.fr>
Date: Fri, 4 Oct 2024 21:02:10 +0200
Subject: [PATCH 7/8] Update README.md

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e40052da..f503ac43 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,9 @@ You can configure the version and properties adjustments for specific branches a
   - has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
 - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
   - default is `true`
-- `<describeTagMaxDepth>` An integer that describes the maximum number of commits to scan in search of a tag matching
+- `<describeTagMaxDepth>` An integer that describes the maximum distance in number of commits when searching a tag
+  matching `<describeTagPattern>` from the ref commit. This value is applied on all `<ref>` elements unless specified
+  otherwise in the `<ref>` config.
   `<describeTagPattern>`.
   - By default, it is set to `Integer.MAX_VALUE`.
   - For convenience, any strictly negative value will also remove the limitation.
@@ -118,8 +120,9 @@ You can configure the version and properties adjustments for specific branches a
         - will override global `<describeTagPattern>` value
       - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
         - default is `true`
-      - `<describeTagMaxDepth>` An integer that describes the maximum number of commits to scan in search of a tag matching
-        `<describeTagPattern>`.
+      - `<describeTagMaxDepth>` An integer that describes the maximum distance in number of commits when searching a tag
+        matching `<describeTagPattern>` from the ref commit. If no tag is found, `${describe.distance}`'s value is
+        `min(<distance from ref to root commit>, <describeTagMaxDepth>)`.
         - By default, it is set to `Integer.MAX_VALUE`.
         - For convenience, any strictly negative value will also remove the limitation.
           <br><br>

From 51255ce2da16fca8dd8b0c99cb57e85ccc404873 Mon Sep 17 00:00:00 2001
From: Marc Rozanc <marc@rozanc.fr>
Date: Thu, 17 Oct 2024 21:05:44 +0200
Subject: [PATCH 8/8] Remove wildcard import

---
 .../me/qoomon/gitversioning/commons/GitUtil.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 3d382711..957df0f7 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -4,10 +4,12 @@
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.NoWorkTreeException;
-import org.eclipse.jgit.lib.*;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.DepthWalk;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 import java.io.File;
@@ -15,9 +17,11 @@
 import java.nio.file.Files;
 import java.time.Instant;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;