From: Mike Beattie <mike@ethernal.org>
Date: Thu, 25 Oct 2012 07:31:59 +0000 (+1300)
Subject: altosdroid: more reliable branch detection
X-Git-Tag: 1.1.9.2~14^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=bb3f42daffafb497639c2c678f6106ce54523ff3

altosdroid: more reliable branch detection

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index e1b650f8..afd64973 100755
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -22,7 +22,7 @@ buildtz=$(date "+%z")
 
 describe=$(git describe --match "$version" --long --always 2>/dev/null || echo '')
 if [ -n "$describe" ]; then
-   branch=$(git status -s -b | sed -ne '1s/^## \(.*\)\.\.\..*$/\1/p')
+   branch=$(git branch | sed -ne 's/^\* //p')
    commitdetails=$(echo $describe | sed -e "s/^$version-//")
    commitnum=$(echo $commitdetails | cut -d- -f1)
    commithash=$(echo $commitdetails | cut -d- -f2)