From c297a00c1b1d6b8f8e0160bcf39d01ae30824c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Wed, 1 Dec 2021 12:41:25 +0100 Subject: [PATCH] Change commithook to work with force-pushed commits --- www/commands/server_gitwebhook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/commands/server_gitwebhook.php b/www/commands/server_gitwebhook.php index c7f7b6e..ed3c428 100644 --- a/www/commands/server_gitwebhook.php +++ b/www/commands/server_gitwebhook.php @@ -14,7 +14,7 @@ $uri = $ROUTE->full_url; $cmd = ""; if ($hook == 'website_mikescher') - $cmd = 'git pull'; + $cmd = 'git fetch ; git reset origin/master --hard'; else if ($hook == 'griddominance') $cmd = 'update-gdapi'; else