summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2016-10-19 11:45:05 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2016-10-19 11:45:11 +0900
commita963273d857278757f98a6eaf602949a142493eb (patch)
tree8e809e801b2e2a5ba0cabd5dbc31ebe83c724457
parentc0433f4fb7d729236f5d4b6e0e2341aa38a65fb3 (diff)
parenta66b4c29a824306b5c606a079b72d8b57335a76f (diff)
downloadjgit-a963273d857278757f98a6eaf602949a142493eb.tar.gz
jgit-a963273d857278757f98a6eaf602949a142493eb.zip
Merge branch 'stable-4.5'
* stable-4.5: Config: do not add spaces before units Change-Id: I54185f54e6d78d7aac873ee5f990f09582318857 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
index a041bb70c4..8fe8a96e99 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
@@ -835,11 +835,11 @@ public class Config {
final String s;
if (value >= GiB && (value % GiB) == 0)
- s = String.valueOf(value / GiB) + " g"; //$NON-NLS-1$
+ s = String.valueOf(value / GiB) + "g"; //$NON-NLS-1$
else if (value >= MiB && (value % MiB) == 0)
- s = String.valueOf(value / MiB) + " m"; //$NON-NLS-1$
+ s = String.valueOf(value / MiB) + "m"; //$NON-NLS-1$
else if (value >= KiB && (value % KiB) == 0)
- s = String.valueOf(value / KiB) + " k"; //$NON-NLS-1$
+ s = String.valueOf(value / KiB) + "k"; //$NON-NLS-1$
else
s = String.valueOf(value);