X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=luci.mk;h=137886f1b322c75655a0276c03cfd63ed86b1aa7;hp=69aecaa250578a821665e186244dfa53026fa66f;hb=91daed4530cc2e47bc7cf796bbbfc58d56027bf8;hpb=6a7eaeb4860bcdfac0ecf4349afc396212c1d467 diff --git a/luci.mk b/luci.mk index 69aecaa25..137886f1b 100644 --- a/luci.mk +++ b/luci.mk @@ -70,7 +70,8 @@ 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 branch --remote --verbose --no-abbrev --contains 2>/dev/null | \ + sed -rne 's|^[^/]+/([^ ]+) [a-f0-9]{40} .+$$|\1|p' | head -n1)"; \ if [ "$$branch" != "master" ]; then \ variant="LuCI $$branch branch"; \ else \