diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-10-25 20:31:59 +1300 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-10-25 20:34:58 +1300 |
| commit | bb3f42daffafb497639c2c678f6106ce54523ff3 (patch) | |
| tree | 7df0b614a71a83c3688de236e1f77d2f3e2c8958 | |
| parent | 963f7715be6c67056bbd8bbe898639adac64fc29 (diff) | |
altosdroid: more reliable branch detection
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rwxr-xr-x | altosdroid/buildinfo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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) |