projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
963f771
)
altosdroid: more reliable branch detection
author
Mike Beattie
<mike@ethernal.org>
Thu, 25 Oct 2012 07:31:59 +0000
(20:31 +1300)
committer
Mike Beattie
<mike@ethernal.org>
Thu, 25 Oct 2012 07:34:58 +0000
(20:34 +1300)
Signed-off-by: Mike Beattie <mike@ethernal.org>
altosdroid/buildinfo.sh
patch
|
blob
|
history
diff --git
a/altosdroid/buildinfo.sh
b/altosdroid/buildinfo.sh
index e1b650f8f2e04afc2c294075473f0704b4ead9d4..afd649735d235a741f57d267864e6fe92077611d 100755
(executable)
--- 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)