From ada7e7572f2206746d7f76ff8aad871ad521be6d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 19 Feb 2026 10:48:01 +0100 Subject: [PATCH] topdir.mk: git-pull-%: Always use pgit.sh git-pull- doesn't use pgit.sh if username == login. pgit.sh should handle that case fine now, so remove the distinction from topdir.mk and make it in one place, i.e. pgit.sh. This has the additional advantage that pull as done by pgit.sh conveniently uses --autostash. Signed-off-by: Jan Lindemann --- make/topdir.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index 6497e557..88375888 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -204,11 +204,7 @@ git-pull-maintainer: make git-pull-$(call proj_query,getval global jw-maintainer) git-pull-%: - if [ "$*" = "$(JANWARE_USER)" ]; then \ - git pull origin $(GIT_MAIN_BRANCH) ;\ - else \ - PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) ;\ - fi + PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) pkg-manager-refresh: $(PKG_MANAGER) refresh