Fix cloning issue (#70)

* Fix cloning issue
stakater · Jun 19, 2020 · a031afb · a031afb
1 parent b9b6ca9
commit a031afb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/io/stakater/vc/Git.groovy b/src/io/stakater/vc/Git.groovy
@@ -227,7 +227,7 @@ def cloneRepoWithCredentials(String repoURL, String username, String password, S
     def common = new io.stakater.Common()
     String newURL = common.replaceCredentialsInHttpURL(repoURL, username, password)
     sh """
-        git clone $newURL .
+        git clone $newURL . 2>/dev/null
         git checkout $branchName
     """
 }

diff --git a/vars/releaseApplication.groovy b/vars/releaseApplication.groovy
@@ -11,7 +11,7 @@ def call(body) {
 
     timestamps {
         stakaterNode(config) {
-            withSCM { String repoUrl, String repoName, String repoOwner, String repoBranch ->
+            withSCM { String repoUrl, String repoName, String repoOwner, String repoBranch, String repoCloneBranch ->
 
                 def appConfig = new io.stakater.app.AppConfig()
                 Map packageConfig = appConfig.getPackageConfig(config)
@@ -42,7 +42,7 @@ def call(body) {
                 def buildException = null
 
                 if (cloneUsingToken && !isPullRequest) {
-                    git.cloneRepoWithCredentials(repoUrl, gitConfig.user, gitConfig.tokenSecret, repoBranch)
+                    git.cloneRepoWithCredentials(repoUrl, gitConfig.user, gitConfig.tokenSecret, repoCloneBranch)
                 }
                 else {
                     checkout scm