diff --git a/pom.xml b/pom.xml index 9003ccd..1f818f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.nqm gis - 1.1.0 + 1.1.1 ${packaging} diff --git a/src/main/java/org/nqm/Gis.java b/src/main/java/org/nqm/Gis.java index a7bb34e..a341d63 100644 --- a/src/main/java/org/nqm/Gis.java +++ b/src/main/java/org/nqm/Gis.java @@ -11,7 +11,7 @@ name = "gis", description = "Git extension wrapper which supports submodules", mixinStandardHelpOptions = true, - version = "1.1.0") + version = "1.1.1") public class Gis extends GitCommand { @Option(names = "-v", description = "Show more details information.", scope = ScopeType.INHERIT) diff --git a/src/main/java/org/nqm/utils/StdOutUtils.java b/src/main/java/org/nqm/utils/StdOutUtils.java index fb5e87e..0606b90 100644 --- a/src/main/java/org/nqm/utils/StdOutUtils.java +++ b/src/main/java/org/nqm/utils/StdOutUtils.java @@ -3,6 +3,7 @@ import static java.lang.System.err; // NOSONAR import static java.lang.System.out; // NOSONAR import static java.util.function.Predicate.not; +import java.nio.file.Path; import java.util.Optional; import java.util.function.UnaryOperator; import java.util.stream.Collectors; @@ -110,7 +111,10 @@ public static String gitStatusOneLine(String line) { default -> Optional.of(lineSplit) .map(StdOutUtils::preProcessUntrackFile) .map(splitS -> " " - + Optional.of(splitS[splitS.length - 1]).map(getFiles(line)).orElse("")) + + Optional.of(splitS[splitS.length - 1]) + .map(getFiles(line)) + .map(l -> Path.of(l).getFileName().toString()) + .orElse("")) .orElse(""); }; }