From: Jo-Philipp Wich Date: Wed, 26 Oct 2011 14:54:57 +0000 (+0000) Subject: getver.sh: cope with varying "git log" line formats to reliably extract the git-svn... X-Git-Tag: reboot~15773 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad6c4198a92d503935a8d2aebd4187540460a992;p=openwrt%2Fstaging%2Fpepe2k.git getver.sh: cope with varying "git log" line formats to reliably extract the git-svn rev (#10268) SVN-Revision: 28604 --- 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" ] }