Options should precede operands to git commands

jenkinsci · Sep 9, 2019 · 2ac7394 · 2ac7394
1 parent c06111d
commit 2ac7394
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -404,15 +404,6 @@ public void execute() throws GitException, InterruptedException {
                 if (isAtLeastVersion(1,7,1,0))
                     args.add("--progress");
 
-                StandardCredentials cred = credentials.get(url.toPrivateString());
-                if (cred == null) cred = defaultCredentials;
-                args.add(url);
-
-                if (refspecs != null)
-                    for (RefSpec rs: refspecs)
-                        if (rs != null)
-                            args.add(rs.toString());
-
                 if (prune) args.add("--prune");
 
                 if (shallow) {
@@ -424,6 +415,15 @@ public void execute() throws GitException, InterruptedException {
 
                 warnIfWindowsTemporaryDirNameHasSpaces();
 
+                StandardCredentials cred = credentials.get(url.toPrivateString());
+                if (cred == null) cred = defaultCredentials;
+                addCheckedRemoteUrl(args, url.toPrivateASCIIString());
+
+                if (refspecs != null)
+                    for (RefSpec rs: refspecs)
+                        if (rs != null)
+                            args.add(rs.toString());
+
                 /* If url looks like a remote name reference, convert to remote URL for authentication */
                 /* See JENKINS-50573 for more details */
                 /* "git remote add" rejects remote names with ':' (and it is a common character in remote URLs) */