Change-Id: I8603fcdfd0244088b3b217f002a78e7a646ea205 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.12.0.202105261145-m3
@@ -1610,11 +1610,9 @@ public class DirCacheCheckout { | |||
} | |||
if (rc != 0) { | |||
throw new IOException(new FilterFailedException(rc, | |||
checkoutMetadata.smudgeFilterCommand, | |||
path, | |||
checkoutMetadata.smudgeFilterCommand, path, | |||
result.getStdout().toByteArray(MAX_EXCEPTION_TEXT_SIZE), | |||
RawParseUtils.decode(result.getStderr() | |||
.toByteArray(MAX_EXCEPTION_TEXT_SIZE)))); | |||
result.getStderr().toString(MAX_EXCEPTION_TEXT_SIZE))); | |||
} | |||
} | |||
@@ -502,8 +502,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { | |||
throw new IOException(new FilterFailedException(rc, | |||
filterCommand, getEntryPathString(), | |||
result.getStdout().toByteArray(MAX_EXCEPTION_TEXT_SIZE), | |||
RawParseUtils.decode(result.getStderr() | |||
.toByteArray(MAX_EXCEPTION_TEXT_SIZE)))); | |||
result.getStderr().toString(MAX_EXCEPTION_TEXT_SIZE))); | |||
} | |||
return result.getStdout().openInputStreamWithAutoDestroy(); | |||
} |
@@ -18,6 +18,7 @@ import java.io.FileOutputStream; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.io.OutputStream; | |||
import java.io.UncheckedIOException; | |||
import java.util.ArrayList; | |||
import org.eclipse.jgit.internal.JGitText; | |||
@@ -212,6 +213,24 @@ public abstract class TemporaryBuffer extends OutputStream { | |||
return out; | |||
} | |||
/** | |||
* Convert first {@code limit} number of bytes of the buffer content to | |||
* String. | |||
* | |||
* @param limit | |||
* the maximum number of bytes to be converted to String | |||
* @return first {@code limit} number of bytes of the buffer content | |||
* converted to String. | |||
* @since 5.12 | |||
*/ | |||
public String toString(int limit) { | |||
try { | |||
return RawParseUtils.decode(toByteArray(limit)); | |||
} catch (IOException e) { | |||
throw new UncheckedIOException(e); | |||
} | |||
} | |||
/** | |||
* Convert this buffer's contents into a contiguous byte array. If this size | |||
* of the buffer exceeds the limit only return the first {@code limit} bytes |