From 5d2a46f14072c1978b186b6b5ef36250c054547a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Wed, 31 Jan 2024 11:45:57 +0100 Subject: [PATCH] files/create.sql.php: Use git pull -f --rebase --- www/files/create.sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/files/create.sql.php b/www/files/create.sql.php index ed3069e..e780b4f 100644 --- a/www/files/create.sql.php +++ b/www/files/create.sql.php @@ -11,7 +11,7 @@ $repo = "winzer/elwig-misc.git"; $url = "https://token:$token@git.necronda.net/$repo"; $schema_version = $_GET['v']; -shell_exec("cd .repos; git clone $url; cd elwig-misc; git checkout main; git pull"); +shell_exec("cd .repos; git clone $url; cd elwig-misc; git checkout main; git pull -f --rebase"); if ($schema_version) { $commit = shell_exec("cd .repos/elwig-misc; git log -p sql/v01/99.schema_version.sql | grep '+PRAGMA schema_version = ${schema_version}00;' -B 14 | head -n 1 | grep -oE '[^ ]+$'");