[JENKINS-21016] fix git credentials so that password is included in f…

…ile and correct syntax of store command
jenkinsci · Dec 20, 2013 · fa5b79e · fa5b79e
1 parent bb90484
commit fa5b79e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -978,7 +978,9 @@ private String launchCommandWithCredentials(ArgumentListBuilder args, File workD
 
                     String urlWithCredentials = getGitCrendentialsURL(url, credentials);
                     store = createGitCredentialsStore(urlWithCredentials);
-                    launchCommandIn(workDir, "config", "--local", "credential.helper", "store --store=\"" + store.getAbsolutePath() + "\"");
+                    // git cli needs forward slashes for the store path
+                    String path = store.getAbsolutePath().replace('\\','/');
+                    launchCommandIn(workDir, "config", "--local", "credential.helper", "store --file=\\\"" + path + "\\\"");
                 }
             }
 
@@ -1554,7 +1556,8 @@ private String getGitCrendentialsURL(URIish u, StandardCredentials cred) {
                      .setPass(Secret.toString(up.getPassword()));
         }
 
-        return uri.toString();
+        // use toPrivateString to include the password too
+        return uri.toPrivateString();
     }
 
     /**