Skip to content

JGitStatusCommand: filter results by fileSet.getFileList() if not empty #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piercemar wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −1
Open

JGitStatusCommand: filter results by fileSet.getFileList() if not empty #1370

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86e7ed7
Fix JGitStatusCommand to respect fileSet if not empty
piercemar Mar 19, 2026
f4ec0ee
Apply Spotless format
Apr 27, 2026
f7bbdd3
Merge branch 'apache:master' into feature/jgit_status_fileset
piercemar Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...rc/main/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -51,7 +54,11 @@ protected StatusScmResult executeStatusCommand(ScmProviderRepository repo, ScmFi
git = JGitUtils.openRepo(fileSet.getBasedir());
Status status = git.status().call();
List<ScmFile> changedFiles = getFileStati(status);

if (!fileSet.getFileList().isEmpty()) {
Set<String> fileSetPaths =
fileSet.getFileList().stream().map(File::toString).collect(Collectors.toSet());
changedFiles.removeIf(scmFile -> !fileSetPaths.contains(scmFile.getPath()));

@kwin kwin Jun 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The base directory of the fileSet is not necessarily the root directory of the working copy, therefore some file adjustments are necessary before comparing with changedFiles.path.

}
return new StatusScmResult("JGit status", changedFiles);
} catch (IOException | GitAPIException e) {
throw new ScmException("JGit status failure!", e);
Expand Down