git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 06/15] version-gen: simplify `git describe` checks

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 24, 2023, 16:50 UTC
Message-ID
<20230424165041.25180-7-felipe.contreras@gmail.com>
In-Reply-To
<20230424165041.25180-1-felipe.contreras@gmail.com>

How can `git describe --match 'foo*'` return something that doesn't contain 'foo' and without error?

It can't, so no need for check for the impossible.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 GIT-VERSION-GEN | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 34f561752b..e99c7b45c0 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -3,22 +3,11 @@
 GVF=GIT-VERSION-FILE
 DEF_VER=v2.40.GIT
 
-LF='
-'
-
 describe () {
 	VN=$(git describe --match "v[0-9]*" 2>/dev/null) || return 1
-	case "$VN" in
-	*$LF*)
-		return 1
-		;;
-	v[0-9]*)
-		git update-index -q --refresh
-		test -z "$(git diff-index --name-only HEAD --)" ||
-		VN="$VN-dirty"
-		return 0
-		;;
-	esac
+	git update-index -q --refresh
+	test -z "$(git diff-index --name-only HEAD --)" ||
+	VN="$VN-dirty"
 }
 
 # First see if there is a version file (included in release tarballs),
-- 
2.40.0+fc1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 7 of 16 in “version-gen: complete revamp/rewrite”
  1. 00/15 version-gen: complete revamp/rewriteFelipe Contreras, Apr 24, 2023
  2. 04/15 version-gen: simplify v prefix removalFelipe Contreras, Apr 24, 2023
  3. 01/15 version-gen: reorganizeFelipe Contreras, Apr 24, 2023
  4. 03/15 version-gen: refactor default versionFelipe Contreras, Apr 24, 2023
  5. 02/15 version-gen: trivial cleanupFelipe Contreras, Apr 24, 2023
  6. 05/15 version-gen: simplify update checkFelipe Contreras, Apr 24, 2023
  7. 06/15 version-gen: simplify `git describe` checksFelipe Contreras, Apr 24, 2023
  8. 07/15 version-gen: simplify dirty checkFelipe Contreras, Apr 24, 2023
  9. 08/15 version-gen: move describe fix into functionFelipe Contreras, Apr 24, 2023
  10. 09/15 version-gen: describe and sed in one goFelipe Contreras, Apr 24, 2023
  11. 10/15 version-gen: refactor describe functionFelipe Contreras, Apr 24, 2023
  12. 11/15 version-gen: do v fix only when necessaryFelipe Contreras, Apr 24, 2023
  13. 12/15 version-gen: move v fix into sedFelipe Contreras, Apr 24, 2023
  14. 13/15 version-gen: refactor main functionalityFelipe Contreras, Apr 24, 2023
  15. 14/15 version-gen: refactor GIT_VERSION stringFelipe Contreras, Apr 24, 2023
  16. 15/15 version-gen: get rid of GVF variableFelipe Contreras, Apr 24, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.