This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 7820333686 Git Clean no longer offers files git ignores on a
case-insensitive file system, fixes #8931 (#9276)
7820333686 is described below
commit 7820333686b648b4693ba3b5928797cef4178600
Author: Bart Maertens <[email protected]>
AuthorDate: Thu Nov 5 15:02:36 2026 +0100
Git Clean no longer offers files git ignores on a case-insensitive file
system, fixes #8931 (#9276)
---
.../main/java/org/apache/hop/git/model/UIGit.java | 14 ++++++++++--
.../java/org/apache/hop/git/model/UIGitTest.java | 25 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/plugins/misc/git/src/main/java/org/apache/hop/git/model/UIGit.java
b/plugins/misc/git/src/main/java/org/apache/hop/git/model/UIGit.java
index 197916f67a..2b5f4d09b4 100644
--- a/plugins/misc/git/src/main/java/org/apache/hop/git/model/UIGit.java
+++ b/plugins/misc/git/src/main/java/org/apache/hop/git/model/UIGit.java
@@ -1443,7 +1443,7 @@ public class UIGit extends VCS {
return;
}
try {
- Set<String> untracked = git.status().call().getUntracked();
+ Set<String> untracked = getUntrackedNotIgnored(git.status().call());
File workTree = new File(directory);
for (String path : paths) {
String normalizedPath = normalizePathForJGit(path);
@@ -1515,7 +1515,7 @@ public class UIGit extends VCS {
if (normalizedPath != null && !".".equals(normalizedPath)) {
statusCommand = statusCommand.addPath(normalizedPath);
}
- List<String> files = new
ArrayList<>(statusCommand.call().getUntracked());
+ List<String> files = new
ArrayList<>(getUntrackedNotIgnored(statusCommand.call()));
Collections.sort(files);
return files;
} catch (Exception e) {
@@ -2023,6 +2023,16 @@ public class UIGit extends VCS {
return false;
}
+ /**
+ * The untracked files of a status that git itself doesn't ignore: what a
git clean removes. JGit
+ * also reports the files that only a case insensitive ignore rule matches
as untracked.
+ */
+ private Set<String> getUntrackedNotIgnored(Status status) {
+ Set<String> untracked = new HashSet<>(status.getUntracked());
+ untracked.removeAll(getCaseInsensitiveIgnored(untracked));
+ return untracked;
+ }
+
/**
* The files JGit reports as untracked but git itself ignores. JGit matches
ignore rules case
* sensitively whatever core.ignorecase says, so on a case insensitive file
system a rule like
diff --git
a/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java
b/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java
index a6342ec73e..92dc8bcc34 100644
--- a/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java
+++ b/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java
@@ -1092,6 +1092,31 @@ public class UIGitTest extends RepositoryTestCase {
assertFalse(unstaged.contains("output/generated.txt"));
}
+ @Test
+ public void testCleanLeavesFilesIgnoredWithoutRegardToCase() throws
Exception {
+ initialCommit();
+
+ writeTrashFile(".gitignore", "output/\n");
+ File ignored = writeTrashFile("logging/Output/results.csv", "ignored");
+ File untracked = writeTrashFile("logging/untracked-test.txt", "untracked");
+
+ db.getConfig()
+ .setBoolean(
+ ConfigConstants.CONFIG_CORE_SECTION,
+ null,
+ CaseInsensitiveIgnores.CONFIG_KEY_IGNORECASE,
+ true);
+ db.getConfig().save();
+
+ // git ignores "Output/" through the "output/" rule, so a clean doesn't
offer it
+ assertEquals(List.of("logging/untracked-test.txt"),
uiGit.getUntrackedPathFiles("logging"));
+
+ // Nor does it remove it when it's passed in anyway
+ uiGit.cleanPaths(List.of("logging/Output/results.csv",
"logging/untracked-test.txt"));
+ assertTrue(ignored.exists());
+ assertFalse(untracked.exists());
+ }
+
private List<String> getUnstagedFileNames() {
return uiGit.getUnstagedFiles().stream().map(UIFile::getName).toList();
}