From aa8d1cbfc6212d60f095acc259a22ff79d0cb821 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 26 Feb 2026 14:12:53 +0100 Subject: [PATCH] projects-dir.mk: get-get-%: Merge into current branch Don't use the master branch as target when getting code from somebody, merge into the branch currently checked out. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 9ab1fd35..752c0f4a 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -342,7 +342,7 @@ git-get-maintainer: $(SSH_WRAPPER_SH) PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make git-get-maintainer git-get-%: $(SSH_WRAPPER_SH) - $(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK) --refspec "$*:master:master" + $(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK) --refspec "$*:master:current-branch" git-show-non-master-branches: $(Q)$(PGIT_SH) branch 2>&1 | \