janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 17:23:36 +02:00
Code Activity Actions

topdir.mk: git-pull-%: Always use pgit.sh

Browse source 
git-pull-<username> 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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-19 10:48:01 +01:00
commit ada7e7572f
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/topdir.mk
View file

@ -204,11 +204,7 @@ git-pull-maintainer:
make git-pull-$(call proj_query,getval global jw-maintainer) make git-pull-$(call proj_query,getval global jw-maintainer)
git-pull-%: git-pull-%:
if [ "$*" = "$(JANWARE_USER)" ]; then \ PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH)
git pull origin $(GIT_MAIN_BRANCH) ;\
else \
PGIT_CLONE_PROJECTS=. $(PGIT_SH) clone --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) ;\
fi
pkg-manager-refresh: pkg-manager-refresh:
$(PKG_MANAGER) refresh $(PKG_MANAGER) refresh