Replace a hard-coded default remote's name with a constant

Change-Id: I4e369382b8a83a5c0772462d1b176b1e23910ada

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 605f9552f885a0c103217244e57d45c303868985..a136df5618761b192824799c91728470232dd890 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
@@ -73,7 +73,7 @@ import org.eclipse.jgit.transport.URIish;
 @Command(common = true, usage = "Clone a repository into a new directory")
 class Clone extends AbstractFetchCommand {
        @Option(name = "--origin", aliases = { "-o" }, metaVar = "name", usage = "use <name> instead of 'origin' to track upstream")
-       private String remoteName = "origin";
+       private String remoteName = Constants.DEFAULT_REMOTE_NAME;
 
        @Argument(index = 0, required = true, metaVar = "uri-ish")
        private String sourceUri;

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
index 7315e44cb511aca5c697ebd15a70b0be8bb01342..6ed468510fae37b0ca6186440de1ead3560d47f1 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Google Inc.
+ * Copyright (C) 2009, Mykola Nikishov <mn@mn.com.ua>
  * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
  * and other copyright owners as documented in the project's IP log.
  *
@@ -48,6 +49,7 @@ import java.util.List;
 
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.TextProgressMonitor;
 import org.eclipse.jgit.transport.FetchResult;
 import org.eclipse.jgit.transport.RefSpec;
@@ -81,7 +83,7 @@ class Fetch extends AbstractFetchCommand {
        }
 
        @Argument(index = 0, metaVar = "uri-ish")
-       private String remote = "origin";
+       private String remote = Constants.DEFAULT_REMOTE_NAME;
 
        @Argument(index = 1, metaVar = "refspec")
        private List<RefSpec> toget;

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
index 8afa5227d29b2c56ff8ca31f01e5aa3a26ec45fa..6248ec29917eed0dc9e4961e6224f39e1464857e 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
@@ -65,7 +65,7 @@ class Push extends TextBuiltin {
        int timeout = -1;
 
        @Argument(index = 0, metaVar = "uri-ish")
-       private String remote = "origin";
+       private String remote = Constants.DEFAULT_REMOTE_NAME;
 
        @Argument(index = 1, metaVar = "refspec")
        private final List<RefSpec> refSpecs = new ArrayList<RefSpec>();

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
index 42f3debc2c3e99d4d7a33a33bd656e2a7c1683f1..de1315957b0511d5bb4841d56e5d2cd47f3718ee 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
@@ -258,6 +258,9 @@ public final class Constants {
        /** A gitignore file name */
        public static final String GITIGNORE_FILENAME = ".gitignore";
 
+       /** Default remote name used by clone, push and fetch operations */
+       public static final String DEFAULT_REMOTE_NAME = "origin";
+
        /**
         * Create a new digest function for objects.
         *