From b6d719d1a0bb468dd48155340bd9fd7b40dcd014 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Mon, 6 Jan 2025 16:32:13 +0100
Subject: [PATCH] Git: add --force on git fetch
---
public_html/deployment/classes/vcs.git.class.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php
index 00b5020e..9302e88f 100644
--- a/public_html/deployment/classes/vcs.git.class.php
+++ b/public_html/deployment/classes/vcs.git.class.php
@@ -535,9 +535,10 @@ class vcs implements iVcs
}
// TODO: git 1.9 does needs only the line with --tags
+ // #7706 add --force
$sGitCmd .= ' ( '
// . 'git fetch --update-head-ok --tags --depth 1 2>&1 ; ' // 1.5 s
- . 'git fetch --update-head-ok --tags --depth 1 2>&1 ; ' // 1.5 s
+ . 'git fetch --update-head-ok --tags --depth 1 --force 2>&1 ; ' // 1.5 s
//. 'git fetch --update-head-ok --depth 1 2>&1 ' // 1.5 s
. ') && ';
}
--
GitLab