setlocalversion: simplify the construction of the short version

With the --short option given, scm_version() prints "+".
Just append it.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 3b31702b4a4a62637fbf4eb7600024803636eeb7..5cdf409204aaddc6d1df7bddb055062c2e80a479 100755 (executable)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -121,8 +121,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then
        #
        # If the variable LOCALVERSION is set (including being set
        # to an empty string), we don't want to append a plus sign.
-       scm=$(scm_version --short)
-       res="$res${scm:++}"
+       res="$res$(scm_version --short)"
 fi
 
 echo "$res"