[LEDE-DEV] [PATCH] scripts/getver.sh: treat all commits as local if can't find upstream

[John Crispin]

On 17/11/2016 07:25, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal at milecki.pl>
> 
> 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 at milecki.pl>
Acked-by: John Crispin < john at phrozen.org>

i tried to apply it but is fails. feel free to add my Acked-by and push
it once rebased

	John


> ---
>  scripts/getver.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/getver.sh b/scripts/getver.sh
> index 9b84602..2fd6adb 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 --count ${REBOOT}..$UPSTREAM_BASE)"
>  		else
> -			UPSTREAM_REV=$REV
> +			UPSTREAM_REV=0
>  		fi
>  
>  		if [ "$REV" -gt "$UPSTREAM_REV" ]; then
>