From c4499bda133d4334075e2d838cf24b82b40ff67b Mon Sep 17 00:00:00 2001
From: Axel Hahn <axel.hahn@iml.unibe.ch>
Date: Fri, 14 Nov 2014 10:59:10 +0100
Subject: [PATCH] - added: deploy tags - changed: slect branch is a dropdown
(instead of radio list) - fixed: show stderr on commands - added stderr
output on git commands
---
public_html/deployment/classes/vcs.git.class.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php
index 641d2d29..0f8bce58 100644
--- a/public_html/deployment/classes/vcs.git.class.php
+++ b/public_html/deployment/classes/vcs.git.class.php
@@ -242,9 +242,11 @@ class vcs implements iVcs {
$sGitCmd.='cd "' . $this->_sTempDir . '" && ';
}
- // TODO: git 1.9 does needs only the 1st line
- $sGitCmd.='git fetch --update-head-ok --depth 1 2>&1 && '
- .'git fetch --update-head-ok --tags --depth 1 2>&1 && ';
+ // TODO: git 1.9 does needs only the line with --tags
+ $sGitCmd.=' ( '
+ . 'git fetch --update-head-ok --tags --depth 1 2>&1 ; '
+ . 'git fetch --update-head-ok --depth 1 2>&1 '
+ . ') && ';
}
$sGitCmd.='git log -1 "' . $this->_sCurrentBranch . '" 2>&1 ; ';
--
GitLab