aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2016-11-17 07:25:21 +0100
committerRafał Miłecki <rafal@milecki.pl>2016-11-21 14:36:04 +0100
commitbf3d92f0cdcea5cd9ec30f54d6e4d350cda1bb41 (patch)
tree43daa91665d9ee690d275036bac62da4e998cf32 /scripts
parenta0ea22ac430f91ab045431a79b2e2161e66cd56a (diff)
downloadupstream-bf3d92f0cdcea5cd9ec30f54d6e4d350cda1bb41.tar.gz
upstream-bf3d92f0cdcea5cd9ec30f54d6e4d350cda1bb41.tar.bz2
upstream-bf3d92f0cdcea5cd9ec30f54d6e4d350cda1bb41.zip
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
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