diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2021-05-23 12:14:28 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-05-27 04:01:51 +0900 |
| commit | 042da426f8ebde012be9429ff705232af7ad7469 (patch) | |
| tree | 05efee595cc175a7d5c4349a331ef1a981d0afd2 /scripts | |
| parent | scripts/setlocalversion: factor out 12-chars hash construction (diff) | |
| download | linux-dev-042da426f8ebde012be9429ff705232af7ad7469.tar.xz linux-dev-042da426f8ebde012be9429ff705232af7ad7469.zip | |
scripts/setlocalversion: simplify the short version part
Reduce the indentation.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Nico Schottelius <nico-linuxsetlocalversion@schottelius.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 8 |
1 files 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" |