From 49316748c9cd1041d0a3aaeecca83b2b13db758e Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Fri, 20 Sep 2024 14:24:06 +0200
Subject: [PATCH] mark places
---
public_html/deployment/classes/project.class.php | 4 +++-
public_html/deployment/classes/vcs.git.class.php | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 9c06d48b..d919f42a 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 dc16c3dd..1245a207 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>");
--
GitLab