From: Felipe Contreras Date: Fri, 14 Apr 2023 12:18:32 GMT Subject: [PATCH 09/18] version-gen: move describe fix into function Message-ID: <20230414121841.373980-10-felipe.contreras@gmail.com> In-Reply-To: <20230414121841.373980-1-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- GIT-VERSION-GEN | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9be9e14204..b7d2b8758e 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,8 @@ describe () { if test -f version then VN=$(cat version) -elif describe -then - VN=$(echo "$VN" | sed -e 's/-/./g') +else + describe fi : "${VN:=$DEF_VER}" -- 2.40.0+fc1