* [PATCH] version-gen: cleanup
@ 2021-06-25 21:29 Felipe Contreras
0 siblings, 0 replies; only message in thread
From: Felipe Contreras @ 2021-06-25 21:29 UTC (permalink / raw)
To: git; +Cc: Ævar Arnfjörð Bjarmason, Felipe Contreras
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
I sent this patch a long time ago and nobody saw any problem with it
other than a minor nit of using an if instead of an early exit.
https://lore.kernel.org/git/1381561628-20665-2-git-send-email-felipe.contreras@gmail.com/
GIT-VERSION-GEN | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9c125f298a..60e0f8c6d2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -6,22 +6,29 @@ DEF_VER=v2.32.0
LF='
'
-# First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
-if test -f version
-then
- VN=$(cat version) || VN="$DEF_VER"
-elif test -d ${GIT_DIR:-.git} -o -f .git &&
- VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
+describe () {
+ VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) || return 1
case "$VN" in
- *$LF*) (exit 1) ;;
+ *$LF*)
+ return 1
+ ;;
v[0-9]*)
git update-index -q --refresh
test -z "$(git diff-index --name-only HEAD --)" ||
- VN="$VN-dirty" ;;
+ VN="$VN-dirty"
+ return 0
+ ;;
esac
+}
+
+# First see if there is a version file (included in release tarballs),
+# then try 'git describe', then default.
+if test -f version
then
- VN=$(echo "$VN" | sed -e 's/-/./g');
+ VN=$(cat version) || VN="$DEF_VER"
+elif test -d ${GIT_DIR:-.git} -o -f .git && describe
+then
+ VN=$(echo "$VN" | sed -e 's/-/./g')
else
VN="$DEF_VER"
fi
@@ -34,7 +41,6 @@ then
else
VC=unset
fi
-test "$VN" = "$VC" || {
- echo >&2 "GIT_VERSION = $VN"
- echo "GIT_VERSION = $VN" >$GVF
-}
+test "$VN" = "$VC" && exit
+echo >&2 "GIT_VERSION = $VN"
+echo "GIT_VERSION = $VN" >$GVF
--
2.32.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-25 21:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-25 21:29 [PATCH] version-gen: cleanup Felipe Contreras
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).