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 1

projects-dir.mk: get-get-%: Merge into current branch

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-26 14:12:53 +01:00
commit aa8d1cbfc6
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/projects-dir.mk
View file

@ -342,7 +342,7 @@ git-get-maintainer: $(SSH_WRAPPER_SH)
PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make git-get-maintainer PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make git-get-maintainer
git-get-%: $(SSH_WRAPPER_SH) 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: git-show-non-master-branches:
$(Q)$(PGIT_SH) branch 2>&1 | \ $(Q)$(PGIT_SH) branch 2>&1 | \