summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/src/org
diff options
context:
space:
mode:
authorTomasz Zarna <tomasz.zarna@tasktop.com>2012-11-11 23:43:38 +0100
committerChris Aniszczyk <zx@twitter.com>2012-11-15 15:45:35 -0800
commit074f9194dc5c4ad4987f7ec6f956c7da7d80702c (patch)
tree82aa97e6b4d27e0e37e65b0819b19fd19e577c69 /org.eclipse.jgit.pgm.test/src/org
parente73c6873c7a770e8b102819c41fed0715d07dd62 (diff)
downloadjgit-074f9194dc5c4ad4987f7ec6f956c7da7d80702c.tar.gz
jgit-074f9194dc5c4ad4987f7ec6f956c7da7d80702c.zip
Prefix an abnormal CLI command termination with 'fatal:'
Change-Id: I3d257666c6fbed7b238c575808f73ec518e811b9 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/src/org')
-rw-r--r--org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java4
1 files changed, 3 insertions, 1 deletions
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 78e752d44e..982aa95216 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
@@ -43,6 +43,7 @@
package org.eclipse.jgit.pgm;
import java.io.ByteArrayOutputStream;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -91,7 +92,8 @@ public class CLIGitCommand {
cmd.execute(bean.getArguments().toArray(
new String[bean.getArguments().size()]));
} catch (Die e) {
- return IO.readLines(e.getMessage());
+ return IO.readLines(MessageFormat.format(CLIText.get().fatalError,
+ e.getMessage()));
} finally {
if (cmd.outw != null)
cmd.outw.flush();