From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sat, 9 Jul 2016 13:01:58 +0000 (+0200)
Subject: scripts/getver.sh: avoid use of git rev-list --count
X-Git-Tag: v17.01.0-rc1~2119
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f1765277bacbea47a45ed913ca8fa043e9f71393;p=openwrt%2Fstaging%2Fxback.git

scripts/getver.sh: avoid use of git rev-list --count

This is not a valid option in older git version, used in e.g. RHEL6.

Reported-by: Steven Haigh <netwiz@crc.id.au>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 4c8fab079c..fa2e676925 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -19,13 +19,13 @@ try_git() {
 	case "$GET_REV" in
 	r*)
 		GET_REV="$(echo $GET_REV | tr -d 'r')"
-		BASE_REV="$(git rev-list reboot..HEAD --count)"
+		BASE_REV="$(git rev-list reboot..HEAD | wc -l)"
 		REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
 		;;
 	*)
 		UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
-		UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE --count)"
-		REV="$(git rev-list reboot..$GET_REV --count)"
+		UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l)"
+		REV="$(git rev-list reboot..$GET_REV | wc -l)"
 		if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
 			REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
 		else