diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 9c06d48bdcabeb419c759045f96d44acc12766a3..d919f42ad6795db2b369c4d0d715024e5cec5745 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -1785,7 +1785,9 @@ class project extends base // -------------------------------------------------- $sReturn .= '<h3>' . t('class-project-build-label-get-sources-from-version-control') . '</h3>'; - $sReturn .= '<pre>' . $this->_oVcs->getSources($sTempBuildDir) . '</pre>'; + $sCheckout=$this->_oVcs->getSources($sTempBuildDir); + $sReturn .= '<pre>' . $sCheckout . '</pre>'; + return false; $aRepodata = $this->getRepoRevision(); $sRevisionShort = substr($aRepodata['revision'], 0, 8); diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php index dc16c3dd676f85c7aa091e12171eb26ab23eabc9..1245a2079334314ba565359dbcd420184b47a237 100644 --- a/public_html/deployment/classes/vcs.git.class.php +++ b/public_html/deployment/classes/vcs.git.class.php @@ -627,6 +627,7 @@ class vcs implements iVcs // $sGitCmd .= 'echo git clone --depth 1 --recursive --branch "' . $sBranchname . '" "' . $this->getUrl() . '" "' . $sWorkDir . '" ; '; // $sGitCmd .= ' git clone --depth 1 --recursive --branch "' . $sBranchname . '" "' . $this->getUrl() . '" "' . $sWorkDir . '" 2>&1; '; // + // #7476 test branches with hash $sGitCmd .= 'echo git clone "' . $this->getUrl() . '" "' . $sWorkDir . '" 2>&1 \&\& cd "' . $sWorkDir . '" \&\& git checkout "' . $sBranchname . '" ; '; $sGitCmd .= ' git clone "' . $this->getUrl() . '" "' . $sWorkDir . '" 2>&1 && cd "' . $sWorkDir . '" && git checkout "' . $sBranchname . '" 2>&1 '; $this->log(__FUNCTION__ . " start command <code>$sGitCmd</code>");