[PATCH v2 08/15] version-gen: move describe fix into function
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
GIT-VERSION-GEN | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8edaf8f335..7a7a7fc591 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,6 +5,7 @@ DEF_VER=v2.40.GIT
describe () {
VN=$(git describe --match "v[0-9]*" --dirty 2>/dev/null) || return 1
+ VN=$(echo "$VN" | sed -e 's/-/./g')
}
# First see if there is a version file (included in release tarballs),
@@ -12,9 +13,9 @@ describe () {
if test -f version
then
VN=$(cat version)
-elif test -d "${GIT_DIR:-.git}" -o -f .git && describe
+elif test -d "${GIT_DIR:-.git}" -o -f .git
then
- VN=$(echo "$VN" | sed -e 's/-/./g')
+ describe
fi
: "${VN:=$DEF_VER}"
--
2.40.0+fc1
Felipe Contreras <felipe.contreras@gmail.com>