From 9aba15cd88c6fd8543f89aceb222fe445744fa0b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 21 Feb 2026 12:08:47 +0100 Subject: [PATCH] topdir.mk: git-get-% -> current-branch 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 --- make/rpmdist.mk | 5 ----- make/topdir.mk | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 6aaa8688..a6661323 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -239,9 +239,6 @@ SCM_ADD = cvs add SCM_PUSH = SCM_PULL = cvs update -dP -get-maintainer: - $(SCM_PULL) - define check_scm_sync echo + checking cvs ;\ $(SCM_PULL) ;\ @@ -268,8 +265,6 @@ SCM_ADD = git add SCM_PUSH = git push SCM_PULL = make git-get-maintainer -get-maintainer: git-get-maintainer - define check_scm_sync echo + checking git ;\ $(SCM_PULL) || {\ diff --git a/make/topdir.mk b/make/topdir.mk index be23e8b5..301ceff1 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -206,7 +206,7 @@ git-get-maintainer: make git-get-$(call proj_query,getval global jw-maintainer) 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