Skip to content
Snippets Groups Projects
Commit bf3d92f0 authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files

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: default avatarRafał Miłecki <rafal@milecki.pl>
Acked-by: default avatarJohn Crispin &lt; <john@phrozen.org>
parent a0ea22ac
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment