[backfire] scripts: merge r28604

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28605 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/getver.sh b/scripts/getver.sh
index cd9b90a4bd5d232178eab7e8fbb8677e3712471f..8bb384bd538fbc4a3a249d666cd8dc216e7fb63d 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -18,7 +18,7 @@ try_svn() {
 
 try_git() {
        [ -d .git ] || return 1
 
 try_git() {
        [ -d .git ] || return 1

-       REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
+       REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"

        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }