Skip to content

Commit 4b5dd2c

Browse files
committed
Merge branch 'master' into release/10
# Conflicts: # version
2 parents fc3d03c + 1e6a0d7 commit 4b5dd2c

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/main/java/org/scm4j/releaser/builders/CmdLineBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public CmdLineBuilder(String cmdLine) {
3333

3434
protected Process getProcess(File workingFolder) throws Exception {
3535
pb.redirectErrorStream(true);
36-
pb.inheritIO();
3736
pb.directory(workingFolder);
3837
return pb.start();
3938
}

src/test/java/org/scm4j/releaser/builders/CmdLineBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testBuild() throws Exception {
5959

6060
@Test
6161
public void testParsingCmdLine() throws Exception {
62-
List<String> cmdEth = Arrays.asList("cmd.exe", "/C", "\"sdsds ddgfgf\"", "gradlew.bat", "build");
62+
List<String> cmdEth = Arrays.asList("cmd.exe", "/C", "\"sdsds ddgfgf\"", "gradlew.bat", "build");
6363
CmdLineBuilder cmd = new CmdLineBuilder(StringUtils.join(cmdEth, " "));
6464
assertTrue(cmdEth.containsAll(cmd.getProcessBuilder().command()));
6565
assertTrue(cmd.getProcessBuilder().command().containsAll(cmdEth));

0 commit comments

Comments
 (0)