Skip to content

Commit b3ebaae

Browse files
committed
Ensure outputs are always consumed
1 parent 6c83ea4 commit b3ebaae

File tree

1 file changed

+4
-13
lines changed
  • src/main/groovy/net/minecrell/gitpatcher

1 file changed

+4
-13
lines changed

src/main/groovy/net/minecrell/gitpatcher/Git.groovy

+4-13
Original file line numberDiff line numberDiff line change
@@ -70,37 +70,28 @@ class Git {
7070
assert result == 0, 'Process returned error code'
7171
}
7272

73-
void setup(OutputStream out, OutputStream err) {
74-
if (out) {
75-
process.consumeProcessOutputStream(out)
76-
}
77-
if (err) {
78-
process.consumeProcessErrorStream(err)
79-
}
80-
}
81-
8273
void writeTo(OutputStream out) {
83-
setup(out, System.err)
74+
process.consumeProcessOutput(out, System.err)
8475
execute()
8576
}
8677

8778
void forceWriteTo(OutputStream out) {
88-
setup(out, out)
79+
process.consumeProcessOutput(out, out)
8980
run()
9081
}
9182

9283
def rightShift = this.&writeTo
9384
def rightShiftUnsigned = this.&forceWriteTo
9485

9586
String getText() {
96-
setup(null, System.err)
87+
process.consumeProcessErrorStream((OutputStream) System.err)
9788
def text = process.inputStream.text.trim()
9889
execute()
9990
return text
10091
}
10192

10293
String readText() {
103-
setup(null, System.err)
94+
process.consumeProcessErrorStream((OutputStream) System.err)
10495
def text = process.inputStream.text.trim()
10596
return run() == 0 ? text : null
10697
}

0 commit comments

Comments
 (0)