Messages in this thread Patch in this message |  | | From | Masahiro Yamada <> | Subject | [PATCH 5/5] scripts/setlocalversion: simplify the short version part | Date | Sun, 23 May 2021 12:14:28 +0900 |
| |
Reduce the indentation.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> ---
scripts/setlocalversion | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 62c0bcce1575..151f04971faa 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -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 + scm=$(scm_version --short) + res="$res${scm:++}" fi echo "$res" -- 2.27.0
|  |