From 5e040f652ef5fa42a8bd45ca6fb686d9ff3d842b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 17 Feb 2026 18:13:22 +0100 Subject: [PATCH] topdir.mk: Use pgit.sh for git-pull-% Use pgit.sh to for the git-pull-% target. This should make git-pull-maintainer work. To limit the blast radius for now, only use it if the source user differs from the invoking user. Signed-off-by: Jan Lindemann --- make/topdir.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/topdir.mk b/make/topdir.mk index 34707301..711840e4 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -65,6 +65,7 @@ include $(JWBDIR)/make/rpmdist.mk include $(JWBDIR)/make/rules.mk include $(JWBDIR)/make/doc-rules.mk include $(JWBDIR)/make/list-files.mk +include $(JWBDIR)/make/projects+project.mk STREAMLINE_PROJECT ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh @@ -206,7 +207,7 @@ git-pull-%: if [ "$*" = "$(JANWARE_USER)" ]; then \ git pull origin $(GIT_MAIN_BRANCH) ;\ else \ - git pull --rebase --autostash jw-$* $(GIT_MAIN_BRANCH) ;\ + PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) ;\ fi pkg-manager-refresh: