diff --git a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java index 982aa9521..78706da31 100644 --- a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java +++ b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java @@ -70,6 +70,16 @@ public List getArguments() { public static List execute(String str, Repository db) throws Exception { + try { + return IO.readLines(new String(rawExecute(str, db))); + } catch (Die e) { + return IO.readLines(MessageFormat.format(CLIText.get().fatalError, + e.getMessage())); + } + } + + public static byte[] rawExecute(String str, Repository db) + throws Exception { String[] args = split(str); if (!args[0].equalsIgnoreCase("git") || args.length < 2) throw new IllegalArgumentException( @@ -91,14 +101,11 @@ public static List execute(String str, Repository db) try { cmd.execute(bean.getArguments().toArray( new String[bean.getArguments().size()])); - } catch (Die e) { - return IO.readLines(MessageFormat.format(CLIText.get().fatalError, - e.getMessage())); } finally { if (cmd.outw != null) cmd.outw.flush(); } - return IO.readLines(baos.toString()); + return baos.toByteArray(); } /**