From 86e7ed74061900f3e46d422505edac95e7904784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mar=C3=A9chal?= Date: Thu, 19 Mar 2026 20:43:26 +0100 Subject: [PATCH 1/2] Fix JGitStatusCommand to respect fileSet if not empty --- .../git/jgit/command/status/JGitStatusCommand.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java index 60ad85021..c0b98508d 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java @@ -18,10 +18,13 @@ */ package org.apache.maven.scm.provider.git.jgit.command.status; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; @@ -51,7 +54,10 @@ protected StatusScmResult executeStatusCommand(ScmProviderRepository repo, ScmFi git = JGitUtils.openRepo(fileSet.getBasedir()); Status status = git.status().call(); List changedFiles = getFileStati(status); - + if (!fileSet.getFileList().isEmpty()) { + Set fileSetPaths = fileSet.getFileList().stream().map(File::toString).collect(Collectors.toSet()); + changedFiles.removeIf(scmFile -> !fileSetPaths.contains(scmFile.getPath())); + } return new StatusScmResult("JGit status", changedFiles); } catch (IOException | GitAPIException e) { throw new ScmException("JGit status failure!", e); From f4ec0ee81925501b54250c29575ff2680793b3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mar=C3=A9chal?= Date: Mon, 27 Apr 2026 08:22:05 +0200 Subject: [PATCH 2/2] Apply Spotless format --- .../provider/git/jgit/command/status/JGitStatusCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java index c0b98508d..a05fc3957 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java @@ -55,7 +55,8 @@ protected StatusScmResult executeStatusCommand(ScmProviderRepository repo, ScmFi Status status = git.status().call(); List changedFiles = getFileStati(status); if (!fileSet.getFileList().isEmpty()) { - Set fileSetPaths = fileSet.getFileList().stream().map(File::toString).collect(Collectors.toSet()); + Set fileSetPaths = + fileSet.getFileList().stream().map(File::toString).collect(Collectors.toSet()); changedFiles.removeIf(scmFile -> !fileSetPaths.contains(scmFile.getPath())); } return new StatusScmResult("JGit status", changedFiles);