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

SVN-Revision: 28604
This commit is contained in:
Jo-Philipp Wich 2011-10-26 14:54:57 +00:00
parent f15f6bc76f
commit ad6c4198a9

View file

@ -18,7 +18,7 @@ try_svn() {
try_git() { try_git() {
[ -d .git ] || return 1 [ -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}" REV="${REV:+r$REV}"
[ -n "$REV" ] [ -n "$REV" ]
} }