This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 773c5fb5fd13c61510a07ffcd0c80f12d39a9281 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 11 14:41:16 2024 +0100 bin/{sbuild-deb,build-rpm}-package: add FIXME note stating that GitLab clones don't seem to have an "origin" remote. --- bin/build-rpm-package | 4 ++++ bin/sbuild-deb-package | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 99d7cfb..d25b39c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -825,6 +825,10 @@ prepare_workspace() { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git fetch 'origin' "${CHECKOUT}" + # FIXME: there might be an issue with GitLab repositories not having an + # "origin" remote, but dropping this here would mean that our clones + # cannot be updated any longer. We'll keep it as-is for now and + # check the GitLab issue at a later time. git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true git fetch 'origin' 'upstream:upstream' || true diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 581679d..fa2a2f7 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -184,6 +184,10 @@ prepare_workspace() { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git fetch 'origin' "${CHECKOUT}" + # FIXME: there might be an issue with GitLab repositories not having an + # "origin" remote, but dropping this here would mean that our clones + # cannot be updated any longer. We'll keep it as-is for now and + # check the GitLab issue at a later time. git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true git fetch 'origin' 'upstream:upstream' || true -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git