From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 28 Dec 2024 20:19:18 +0000 (+0100)
Subject: git-version-gen: avoid use of grep, suggested by Jim Meyering.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83c5387249b5bbfd32d01a51af14ac53bac1bc36;p=thirdparty%2Fgnulib.git

git-version-gen: avoid use of grep, suggested by Jim Meyering.

* build-aux/git-version-gen: Use /bin/sh case instead.
---

diff --git a/ChangeLog b/ChangeLog
index f8557f9ebc..533383ed94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-12-28  Simon Josefsson  <simon@josefsson.org>
+
+	git-version-gen: avoid use of grep, suggested by Jim Meyering.
+	* build-aux/git-version-gen: Use /bin/sh case instead.
+
 2024-12-28  Simon Josefsson  <simon@josefsson.org>
 
 	git-version-gen: fix preceding change
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
old mode 100755
new mode 100644
index 6d2b62ca3a..f0ca9156c1
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2024-12-28.19; # UTC
+scriptversion=2024-12-28.20; # UTC
 
 # Copyright (C) 2007-2024 Free Software Foundation, Inc.
 #
@@ -212,9 +212,10 @@ fi
 
 if test "x$v" = xUNKNOWN \
         && test -f "$tarball_version_file"-git \
-        && head -1 "$tarball_version_file"-git \
-            | grep -v '^$Format' > /dev/null 2>&1; then
-    v=$(head -1 "$tarball_version_file"-git)
+        && v=$(head -1 "$tarball_version_file"-git); then
+    case $v in
+        *Format*) v=UNKNOWN ;;
+    esac
 fi
 
 # Change the penultimate "-" to ".", for version-comparing tools.