diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-10-26 14:54:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-10-26 14:54:57 +0000 |
| commit | 80c232503163d869b2af20063b1cd70059b25f15 (patch) | |
| tree | 9d826d0495d402c2971c1d6984b6425b9a62cd6b /scripts/getver.sh | |
| parent | 93dc2abf471e861b5850c6102adfa1147a17b35b (diff) | |
| download | master-187ad058-80c232503163d869b2af20063b1cd70059b25f15.tar.gz master-187ad058-80c232503163d869b2af20063b1cd70059b25f15.tar.bz2 master-187ad058-80c232503163d869b2af20063b1cd70059b25f15.zip | |
[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
Diffstat (limited to 'scripts/getver.sh')
| -rwxr-xr-x | scripts/getver.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" ] } |