system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-06 18:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

setlocalversion: make indentation shallower

Browse source 
Return earlier if we are not in the correct git repository. This makes
the code more readable.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
This commit is contained in:
Masahiro Yamada 2023-01-22 23:14:23 +09:00
parent 992ebfab2a
commit 75280bdf49
1 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
scripts/setlocalversion
View file

@ -34,46 +34,49 @@ scm_version()
short=true short=true
fi fi
# Check for git and a git repo. if test -n "$(git rev-parse --show-cdup 2>/dev/null)"; then
if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && return
head=$(git rev-parse --verify HEAD 2>/dev/null); then fi
# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore if ! head=$(git rev-parse --verify HEAD 2>/dev/null); then
# it, because this version is defined in the top level Makefile. return
if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then fi
# If only the short version is requested, don't bother # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it
# running further git commands # because this version is defined in the top level Makefile.
if $short; then if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then
echo "+"
return
fi
# If we are past a tagged commit (like
# "v2.6.30-rc5-302-g72357d5"), we pretty print it.
if atag="$(git describe 2>/dev/null)"; then
echo "$atag" | awk -F- '{printf("-%05d", $(NF-1))}'
fi
# Add -g and exactly 12 hex chars. # If only the short version is requested, don't bother
printf '%s%s' -g "$(echo $head | cut -c1-12)" # running further git commands
if $short; then
echo "+"
return
fi
# If we are past a tagged commit (like
# "v2.6.30-rc5-302-g72357d5"), we pretty print it.
if atag="$(git describe 2>/dev/null)"; then
echo "$atag" | awk -F- '{printf("-%05d", $(NF-1))}'
fi fi
# Check for uncommitted changes. # Add -g and exactly 12 hex chars.
# This script must avoid any write attempt to the source tree, printf '%s%s' -g "$(echo $head | cut -c1-12)"
# which might be read-only. fi
# You cannot use 'git describe --dirty' because it tries to
# create .git/index.lock . # Check for uncommitted changes.
# First, with git-status, but --no-optional-locks is only # This script must avoid any write attempt to the source tree, which
# supported in git >= 2.14, so fall back to git-diff-index if # might be read-only.
# it fails. Note that git-diff-index does not refresh the # You cannot use 'git describe --dirty' because it tries to create
# index, so it may give misleading results. See # .git/index.lock .
# git-update-index(1), git-diff-index(1), and git-status(1). # First, with git-status, but --no-optional-locks is only supported in
if { # git >= 2.14, so fall back to git-diff-index if it fails. Note that
git --no-optional-locks status -uno --porcelain 2>/dev/null || # git-diff-index does not refresh the index, so it may give misleading
git diff-index --name-only HEAD # results.
} | read dummy; then # See git-update-index(1), git-diff-index(1), and git-status(1).
printf '%s' -dirty if {
fi git --no-optional-locks status -uno --porcelain 2>/dev/null ||
git diff-index --name-only HEAD
} | read dummy; then
printf '%s' -dirty
fi fi
} }