diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2010-09-16 17:22:37 -0700 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2010-09-16 17:22:37 -0700 |
commit | 5deb5b9a4aebd562a8680167dc6aee93fd7bb5c5 (patch) | |
tree | 3e963186d1f791e8f9f1a2f4113dd94652ea0846 /org.eclipse.jgit.pgm/src | |
parent | 55714f6e73c9f858eb17eadcb9df05de029017aa (diff) | |
parent | 26f507f0df5822df0f19a5ca16462a4bbfeab5fc (diff) | |
download | jgit-5deb5b9a4aebd562a8680167dc6aee93fd7bb5c5.tar.gz jgit-5deb5b9a4aebd562a8680167dc6aee93fd7bb5c5.zip |
Merge branch 'stable-0.9'
* stable-0.9:
Qualify post-0.9.3 builds
JGit 0.9.3
clone: Correct formatting of init message
Fix cloning of repositories with big objects
Qualify post-0.9.1 builds
JGit 0.9.1
Fix PlotCommitList to set lanes on child-less commits
Diffstat (limited to 'org.eclipse.jgit.pgm/src')
-rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java | 10 | ||||
-rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java index 356966ab59..fd7fd4459b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java @@ -49,6 +49,7 @@ package org.eclipse.jgit.pgm; import java.io.IOException; import java.io.PrintWriter; +import java.text.MessageFormat; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -104,16 +105,19 @@ abstract class AbstractFetchCommand extends TextBuiltin { else if (0 <= cr) s = cr; else { - writer.format(CLIText.get().remoteMessage, pkt); + writer.print(MessageFormat.format(CLIText.get().remoteMessage, + pkt)); writer.println(); break; } if (pkt.charAt(s) == '\r') { - writer.format(CLIText.get().remoteMessage, pkt.substring(0, s)); + writer.print(MessageFormat.format(CLIText.get().remoteMessage, + pkt.substring(0, s))); writer.print('\r'); } else { - writer.format(CLIText.get().remoteMessage, pkt.substring(0, s)); + writer.print(MessageFormat.format(CLIText.get().remoteMessage, + pkt.substring(0, s))); writer.println(); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java index 1b1a8c28e8..1b04989670 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java @@ -114,7 +114,9 @@ class Clone extends AbstractFetchCommand { dst.getConfig().save(); db = dst; - out.format(CLIText.get().initializedEmptyGitRepositoryIn, gitdir.getAbsolutePath()); + out.print(MessageFormat.format( + CLIText.get().initializedEmptyGitRepositoryIn, gitdir + .getAbsolutePath())); out.println(); out.flush(); |