From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 17 Nov 2016 06:25:21 +0000 (+0100)
Subject: scripts/getver.sh: treat all commits as local if can't find upstream
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf3d92f0cdcea5cd9ec30f54d6e4d350cda1bb41;p=openwrt%2Fstaging%2Fstintel.git

scripts/getver.sh: treat all commits as local if can't find upstream

If something goes wrong and script can't find upstream revision it will
return something like:
r2220
which looks like a valid upstream revision 2220. We cant' distinguish it
from e.g. 2200 upstream commits and 20 local ones.

The new format still provides revision number but also points clearly
that is may be not the upstream one:
r0+2220

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: John Crispin < john@phrozen.org>
---

diff --git a/scripts/getver.sh b/scripts/getver.sh
index e718485852..d5f29864b5 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -33,7 +33,7 @@ try_git() {
 			UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
 			UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
 		else
-			UPSTREAM_REV=$REV
+			UPSTREAM_REV=0
 		fi
 
 		if [ "$REV" -gt "$UPSTREAM_REV" ]; then