Make sure git_ver.h doesn't eat random 'g's out of tag names

royger · Mar 9, 2018 · 079cbcb · 079cbcb
1 parent c95a13b
commit 079cbcb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile.autosetup b/Makefile.autosetup
@@ -262,7 +262,8 @@ $(PGPRING): $(PGPRINGOBJS) $(LIBMUTT) $(LIBNCRYPT)
 
 # generated
 git_ver.h: $(ALL_FILES)
-	version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
+	version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | \
+		sed -e 's/^neomutt-[0-9]\{8\}//; s/-g\([a-z0-9]\{6\}\)/-\1/'`; \
 	echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
 	cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
 	rm -f git_ver.h.tmp