janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

git-submod.mk: Fix multiple branches in SUBMOD_MAIN_BRANCH

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-08 13:18:47 +00:00
commit 8e0bd97eae
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/git-submod.mk
View file

@ -14,7 +14,7 @@ SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(C
SUBMOD_SRC_DIR ?= .
SUB_GIT = git -C $(SUBMOD_SRC_DIR)
SUBMOD_PKG_NAME := $(shell $(SUB_GIT) remote -v | sed -n 's/^[a-zA-Z_]\+\s//; s/ *.*//; s%.*/%%; s%\.git%%; 1p')
SUBMOD_MAIN_BRANCH := $(shell $(SUB_GIT) branch --format '%(refname:lstrip=2)')
SUBMOD_MAIN_BRANCH := $(firstword $(shell $(SUB_GIT) branch --format '%(refname:lstrip=2)'))
include $(MODDIR)/make/defs.mk