Do not append a plus sign to version when unclean

This commit is contained in:
Ole André Vadla Ravnås 2022-05-10 00:47:33 +02:00
parent e0097141fd
commit 9dc4573cce

View file

@ -162,15 +162,6 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
# full scm version string # full scm version string
res="$res$(scm_version)" res="$res$(scm_version)"
else
# append a plus sign if the repository is not in a clean
# annotated or signed tagged state (as git describe only
# looks at signed or annotated tags - git tag -a/-s) and
# LOCALVERSION= is not specified
if test "${LOCALVERSION+set}" != "set"; then
scm=$(scm_version --short)
res="$res${scm:++}"
fi
fi fi
echo "$res" echo "$res"