(lucene) branch main updated: jgit/ clean status check should ignore any 'untracked folders' (#13728)

[dw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new d7dc57dd0d6 jgit/ clean status check should ignore any 'untracked folders'  (#13728)
d7dc57dd0d6 is described below

commit d7dc57dd0d624c1a69a69a787dad1b5223d66ba4
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Fri Sep 6 09:01:15 2024 +0200

    jgit/ clean status check should ignore any 'untracked folders'  (#13728)
    
    * Ignore any 'untracked folders' #13719
    * Upgrade jgit to 6.10.0.202406032230-r.
---
 gradle/validation/git-status.gradle | 18 +-----------------
 versions.toml                       |  2 +-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/gradle/validation/git-status.gradle b/gradle/validation/git-status.gradle
index 31b80641683..fa976589836 100644
--- a/gradle/validation/git-status.gradle
+++ b/gradle/validation/git-status.gradle
@@ -74,21 +74,6 @@ configure(rootProject) {
           logger.warn("WARNING: Directory is not a valid git checkout (won't check dirty files): ${rootProject.projectDir}")
         }
       } else {
-        // git ignores any folders which are empty (this includes folders with recursively empty sub-folders).
-        def untrackedNonEmptyFolders = status.untrackedFolders.findAll { path ->
-          File location = file("${rootProject.projectDir}/${path}")
-          boolean hasFiles = false
-          Files.walkFileTree(location.toPath(), new SimpleFileVisitor<Path>() {
-            @Override
-            FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-              hasFiles = true
-              // Terminate early.
-              return FileVisitResult.TERMINATE
-            }
-          })
-          return hasFiles
-        }
-
         def offenders = [
             // Exclude staged changes. These are fine in precommit.
             // "(added)": status.added,
@@ -97,8 +82,7 @@ configure(rootProject) {
             "(conflicting)": status.conflicting,
             "(missing)": status.missing,
             "(modified)": status.modified,
-            "(untracked)": status.untracked,
-            "(untracked non-empty dir)": untrackedNonEmptyFolders
+            "(untracked)": status.untracked
         ].collectMany { fileStatus, files ->
           files.collect {file -> "  - ${file} ${fileStatus}" }
         }.sort()
diff --git a/versions.toml b/versions.toml
index c93d1e405c4..96dfc797080 100644
--- a/versions.toml
+++ b/versions.toml
@@ -14,7 +14,7 @@ hamcrest = "2.2"
 icu4j = "74.2"
 javacc = "7.0.12"
 jflex = "1.8.2"
-jgit = "5.13.1.202206130422-r"
+jgit = "6.10.0.202406032230-r"
 jmh = "1.37"
 jts = "1.17.0"
 junit = "4.13.1"