Skip to content

Commit 71a7494

Browse files
committed
Fix Git commit and deleted resource filter
1 parent 8cf66f0 commit 71a7494

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components/sbm-core/src/main/java/org/springframework/sbm/common/filter/DeletedResourcePathStringFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class DeletedResourcePathStringFilter implements ProjectResourceFinder<Li
2525

2626
@Override
2727
public List<String> apply(ProjectResourceSet projectResourceSet) {
28-
return projectResourceSet.stream()
28+
return projectResourceSet.streamIncludingDeleted()
2929
.filter(r -> r.isDeleted() && !r.getAbsolutePath().toFile().isDirectory())
3030
.map(r -> r.getAbsolutePath().toString())
3131
.collect(Collectors.toList());

components/sbm-core/src/main/java/org/springframework/sbm/engine/git/GitSupport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ public boolean repoExists(File repoDir) {
250250
public void commitWhenGitAvailable(ProjectContext context, String appliedRecipeName, List<String> modifiedResources, List<String> deletedResources) {
251251
if (sbmApplicationProperties.isGitSupportEnabled()) {
252252
File repoDir = context.getProjectRootDirectory().toFile();
253-
modifiedResources = makeRelativeToRoot(modifiedResources, repoDir);
254-
deletedResources = makeRelativeToRoot(deletedResources, repoDir);
253+
modifiedResources = makeRelativeToRepositoryLocation(modifiedResources, repoDir);
254+
deletedResources = makeRelativeToRepositoryLocation(deletedResources, repoDir);
255255
if (repoExists(repoDir)) {
256256
String commitMessage = "SBM: applied recipe '" + appliedRecipeName + "'";
257257
Commit latestCommit = addAllAndCommit(repoDir, commitMessage, modifiedResources, deletedResources);
@@ -269,7 +269,7 @@ public static Optional<String> getBranchName(File repo) {
269269
}
270270
}
271271

272-
private List<String> makeRelativeToRoot(List<String> paths, File projectRootDir) {
272+
private List<String> makeRelativeToRepositoryLocation(List<String> paths, File projectRootDir) {
273273
return paths.stream()
274274
.map(p -> projectRootDir.toPath().relativize(Path.of(p).toAbsolutePath().normalize()))
275275
.map(Path::toString)

0 commit comments

Comments
 (0)