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-get-% -> current-branch

Browse source 
Currently git-get-% pulls into the master branch. Change that to pull
into the branch currently checked out in the workspace, because
that's the more likely use case if you want a quick update from
somewhere.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-21 12:08:47 +01:00
commit 9aba15cd88
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/rpmdist.mk
View file

@ -239,9 +239,6 @@ SCM_ADD = cvs add
SCM_PUSH = SCM_PUSH =
SCM_PULL = cvs update -dP SCM_PULL = cvs update -dP
get-maintainer:
$(SCM_PULL)
define check_scm_sync define check_scm_sync
echo + checking cvs ;\ echo + checking cvs ;\
$(SCM_PULL) ;\ $(SCM_PULL) ;\
@ -268,8 +265,6 @@ SCM_ADD = git add
SCM_PUSH = git push SCM_PUSH = git push
SCM_PULL = make git-get-maintainer SCM_PULL = make git-get-maintainer
get-maintainer: git-get-maintainer
define check_scm_sync define check_scm_sync
echo + checking git ;\ echo + checking git ;\
$(SCM_PULL) || {\ $(SCM_PULL) || {\

2
make/topdir.mk
View file

@ -206,7 +206,7 @@ git-get-maintainer:
make git-get-$(call proj_query,getval global jw-maintainer) make git-get-$(call proj_query,getval global jw-maintainer)
git-get-%: git-get-%:
PGIT_SH_PROJECTS=. $(PGIT_SH) get --refspec $*:$(GIT_MAIN_BRANCH):$(GIT_MAIN_BRANCH) PGIT_SH_PROJECTS=. $(PGIT_SH) get --refspec $*:$(GIT_MAIN_BRANCH):current-branch
pkg-manager-refresh: pkg-manager-refresh:
$(PKG_MANAGER) refresh $(PKG_MANAGER) refresh