From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 26 Oct 2011 14:54:57 +0000 (+0000)
Subject: [scripts] getver.sh: cope with varying "git log" line formats to reliably extract... 
X-Git-Tag: fast2504n-3.10.28-merged~7920
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3c2fe43ac7e32132ec69063ef9ed2cc31c262611;p=openwrt.git

[scripts] getver.sh: cope with varying "git log" line formats to reliably extract the git-svn rev (#10268)


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28604 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/scripts/getver.sh b/scripts/getver.sh
index cd9b90a4bd..8bb384bd53 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -18,7 +18,7 @@ try_svn() {
 
 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" ]
 }