Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci.mk: fix branch detection in detached HEAD state

Browse source 
When LuCI is checked out via pinned feeds configuration, its source tree will
end up in detached head state, requiring some more magic to figure out the
proper branch.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-02-20 14:14:49 +01:00
parent 0f5321d2eb
commit 05c5924434
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
luci.mk
View file

@ -70,7 +70,9 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \
PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \
variant="LuCI"; \ variant="LuCI"; \
if git log -1 >/dev/null 2>/dev/null; then \ if git log -1 >/dev/null 2>/dev/null; then \
branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null)"; \ branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null || \
git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \
sed -e 's|^.*/||; s| .*||; q')"; \
if [ "$$branch" != "master" ]; then \ if [ "$$branch" != "master" ]; then \
variant="LuCI $$branch branch"; \ variant="LuCI $$branch branch"; \
else \ else \