janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-25 09:35:54 +02:00
Code Activity Actions

topdir.mk: Use pgit.sh for git-pull-%

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-17 18:13:22 +01:00
commit 5e040f652e
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/topdir.mk
View file

@ -65,6 +65,7 @@ include $(JWBDIR)/make/rpmdist.mk
include $(JWBDIR)/make/rules.mk include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/doc-rules.mk include $(JWBDIR)/make/doc-rules.mk
include $(JWBDIR)/make/list-files.mk include $(JWBDIR)/make/list-files.mk
include $(JWBDIR)/make/projects+project.mk
STREAMLINE_PROJECT ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh STREAMLINE_PROJECT ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh
@ -206,7 +207,7 @@ git-pull-%:
if [ "$*" = "$(JANWARE_USER)" ]; then \ if [ "$*" = "$(JANWARE_USER)" ]; then \
git pull origin $(GIT_MAIN_BRANCH) ;\ git pull origin $(GIT_MAIN_BRANCH) ;\
else \ else \
git pull --rebase --autostash jw-$* $(GIT_MAIN_BRANCH) ;\ PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) ;\
fi fi
pkg-manager-refresh: pkg-manager-refresh: