diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-12-27 08:27:12 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-12-27 08:30:43 +0100 |
| commit | d986d97dfa992577005e7eee872629de66acca3b (patch) | |
| tree | 56e14bc55deef35a745381ced1ac826a1a658a87 /org.eclipse.jgit.pgm | |
| parent | 6a24cdc5eac9ca351e4956f1cfbe4954d145666b (diff) | |
| parent | f77519775d7cd5638be71e91f70ff11fd653e6c5 (diff) | |
| download | jgit-d986d97dfa992577005e7eee872629de66acca3b.tar.gz jgit-d986d97dfa992577005e7eee872629de66acca3b.zip | |
Merge branch 'master' into next
* master:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
TreeRevFilter: fix wrong stop when the given path disappears
Add config reader for user-defined difftools
PackBitmapIndexV1: support parallel loading of reverse index
Change-Id: I7db97dabaef06e6fdbfa0e8ae7833a4b0d6f2013
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java index 9fc26c9356..d26842c641 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java @@ -199,20 +199,20 @@ class DiffTool extends TextBuiltin { } private void showToolHelp() throws IOException { - String availableToolNames = new String(); + StringBuilder availableToolNames = new StringBuilder(); for (String name : diffTools.getAvailableTools().keySet()) { - availableToolNames += String.format("\t\t{0}\n", name); //$NON-NLS-1$ + availableToolNames.append(String.format("\t\t%s\n", name)); //$NON-NLS-1$ } - String notAvailableToolNames = new String(); + StringBuilder notAvailableToolNames = new StringBuilder(); for (String name : diffTools.getNotAvailableTools().keySet()) { - notAvailableToolNames += String.format("\t\t{0}\n", name); //$NON-NLS-1$ + notAvailableToolNames.append(String.format("\t\t%s\n", name)); //$NON-NLS-1$ } - String userToolNames = new String(); + StringBuilder userToolNames = new StringBuilder(); Map<String, ExternalDiffTool> userTools = diffTools .getUserDefinedTools(); for (String name : userTools.keySet()) { - availableToolNames += String.format("\t\t{0}.cmd {1}\n", //$NON-NLS-1$ - name, userTools.get(name).getCommand()); + userToolNames.append(String.format("\t\t%s.cmd %s\n", //$NON-NLS-1$ + name, userTools.get(name).getCommand())); } outw.println(MessageFormat.format( CLIText.get().diffToolHelpSetToFollowing, availableToolNames, |