X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=luci.mk;h=26f3c94f902df5556e55941c8891326cdaa34a6e;hp=69aecaa250578a821665e186244dfa53026fa66f;hb=05c5924434786c6720e0a497215fce0337d57d82;hpb=0f5321d2ebe801fea77031fed221ae7b13636816 diff --git a/luci.mk b/luci.mk index 69aecaa25..26f3c94f9 100644 --- a/luci.mk +++ b/luci.mk @@ -70,7 +70,9 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ variant="LuCI"; \ 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 \ variant="LuCI $$branch branch"; \ else \