Change-Id: Id0d7801e4de98bf118dbecadf623c9ffd7ab7554tags/v2.0.0.201206130900-r
@@ -476,6 +476,7 @@ unexpectedOddResult=odd: {0} + {1} - {2} | |||
unexpectedRefReport={0}: unexpected ref report: {1} | |||
unexpectedReportLine=unexpected report line: {0} | |||
unexpectedReportLine2={0} unexpected report line: {1} | |||
unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed. | |||
unknownDIRCVersion=Unknown DIRC version {0} | |||
unknownHost=unknown host | |||
unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0} |
@@ -955,11 +955,9 @@ public class RebaseCommand extends GitCommand<RebaseResult> { | |||
static Action parse(String token) { | |||
if (token.equals("pick") || token.equals("p")) | |||
return PICK; | |||
throw new JGitInternalException( | |||
MessageFormat | |||
.format( | |||
"Unknown or unsupported command \"{0}\", only \"pick\" is allowed", | |||
token)); | |||
throw new JGitInternalException(MessageFormat.format( | |||
JGitText.get().unknownOrUnsupportedCommand, token, | |||
PICK.toToken())); | |||
} | |||
} | |||
@@ -536,6 +536,7 @@ public class JGitText extends TranslationBundle { | |||
/***/ public String unexpectedRefReport; | |||
/***/ public String unexpectedReportLine; | |||
/***/ public String unexpectedReportLine2; | |||
/***/ public String unknownOrUnsupportedCommand; | |||
/***/ public String unknownDIRCVersion; | |||
/***/ public String unknownHost; | |||
/***/ public String unknownIndexVersionOrCorruptIndex; |