From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 2 Oct 2022 18:43:46 +0000 (-0700)
Subject: Fix validation of "preN" git tags for git-version.h.
X-Git-Tag: v3.2.7~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329635144238974129454de51161c1c0ba27a60a;p=thirdparty%2Frsync.git

Fix validation of "preN" git tags for git-version.h.
---

diff --git a/mkgitver b/mkgitver
index 50380c87..75c9fe1e 100755
--- a/mkgitver
+++ b/mkgitver
@@ -7,7 +7,7 @@ if [ ! -f git-version.h ]; then
 fi
 
 if test -d "$srcdir/.git" || test -f "$srcdir/.git"; then
-    gitver=`git describe --abbrev=8 2>/dev/null | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(-\|$\)/p'`
+    gitver=`git describe --abbrev=8 2>/dev/null | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*\(-\|$\)/p'`
     if [ -n "$gitver" ]; then
 	echo "#define RSYNC_GITVER \"$gitver\"" >git-version.h.new
 	if ! diff git-version.h.new git-version.h >/dev/null; then