Change-Id: I695d1771b808217b0fbde29805e53a819d8c3303 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.3.0.201903061415-rc1
@@ -175,7 +175,7 @@ notOnAnyBranch=Not currently on any branch. | |||
onBranch=On branch {0} | |||
onBranchToBeBorn=You are on a branch yet to be born | |||
onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. | |||
onlyOneOfIncludeOnlyAllInteractiveCanBeUsed=Only one of --include/--only/--all/--interactive can be used. | |||
onlyOneCommitOptionAllowed=Only one of --include/--only/--all/--interactive can be used. | |||
password=Password: | |||
pathspecDidNotMatch=error: pathspec ''{0}'' did not match any file(s) known to git. | |||
pushTo=To {0} |
@@ -107,7 +107,7 @@ class Commit extends TextBuiltin { | |||
throw die(CLIText.get().pathsRequired); | |||
} | |||
if (only && all) { | |||
throw die(CLIText.get().onlyOneOfIncludeOnlyAllInteractiveCanBeUsed); | |||
throw die(CLIText.get().onlyOneCommitOptionAllowed); | |||
} | |||
if (!paths.isEmpty()) { | |||
for (String p : paths) { | |||
@@ -133,10 +133,11 @@ class Commit extends TextBuiltin { | |||
} else { | |||
branchName = head.getTarget().getName(); | |||
if (branchName.startsWith(Constants.R_HEADS)) { | |||
branchName = branchName.substring(Constants.R_HEADS.length()); | |||
branchName = branchName | |||
.substring(Constants.R_HEADS.length()); | |||
} | |||
} | |||
outw.println("[" + branchName + " " + commit.name() + "] " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ | |||
outw.println('[' + branchName + ' ' + commit.name() + "] " //$NON-NLS-1$ | |||
+ commit.getShortMessage()); | |||
} catch (IOException e) { | |||
throw die(e.getMessage(), e); |
@@ -278,7 +278,7 @@ public class CLIText extends TranslationBundle { | |||
/***/ public String onBranchToBeBorn; | |||
/***/ public String onBranch; | |||
/***/ public String onlyOneMetaVarExpectedIn; | |||
/***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; | |||
/***/ public String onlyOneCommitOptionAllowed; | |||
/***/ public String password; | |||
/***/ public String pathspecDidNotMatch; | |||
/***/ public String pushTo; |