From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Nico Schottelius <nico-linuxsetlocalversion@schottelius.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Michael Ellerman <mpe@ellerman.id.au>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] scripts/setlocalversion: simplify the short version part
Date: Sun, 23 May 2021 12:14:28 +0900 [thread overview]
Message-ID: <20210523031428.164186-5-masahiroy@kernel.org> (raw)
In-Reply-To: <20210523031428.164186-1-masahiroy@kernel.org>
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
next prev parent reply other threads:[~2021-05-23 3:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-23 3:14 [PATCH 1/5] scripts/setlocalversion: remove mercurial, svn and git-svn supports Masahiro Yamada
2021-05-23 3:14 ` [PATCH 2/5] scripts/setlocalversion: remove workaround for old make-kpkg Masahiro Yamada
2021-05-23 3:14 ` [PATCH 3/5] scripts/setlocalversion: add more comments to -dirty flag detection Masahiro Yamada
2021-05-23 3:14 ` [PATCH 4/5] scripts/setlocalversion: factor out 12-chars hash construction Masahiro Yamada
2021-05-23 9:04 ` Nico Schottelius
2021-05-23 3:14 ` Masahiro Yamada [this message]
2021-05-23 7:48 ` [PATCH 1/5] scripts/setlocalversion: remove mercurial, svn and git-svn supports Greg Kroah-Hartman
2021-05-26 14:29 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210523031428.164186-5-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=matthieu.baerts@tessares.net \
--cc=mpe@ellerman.id.au \
--cc=nico-linuxsetlocalversion@schottelius.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox