Commit 042da426 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

scripts/setlocalversion: simplify the short version part

parent 630ff0fa
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -131,15 +131,13 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
	# full scm version string
	res="$res$(scm_version)"
else
elif [ -z "${LOCALVERSION}" ]; then
	# 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

echo "$res"