Avoid debian tags when generating gitrev.h

As suggested by George Rawlinson. closes #46
anse1 · Jan 21, 2022 · 91adda2 · 91adda2
1 parent 0547f1e
commit 91adda2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,7 +83,7 @@ configure_file(config_h.cmake.in config.h)
 # get our git tag
 set(GIT_TAG UNRELEASED)
 execute_process(
-        COMMAND git describe --dirty --tags --always
+        COMMAND git describe --exclude=debian* --dirty --tags --always
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
         OUTPUT_VARIABLE GIT_TAG
         OUTPUT_STRIP_TRAILING_WHITESPACE

diff --git a/Makefile.am b/Makefile.am
@@ -31,8 +31,8 @@ EXTRA_DIST = gitrev.h dump.hh expr.hh grammar.hh log.hh prod.hh		\
     dut.hh postgres.hh monetdb.hh log-v1.0-to-v1.2.sql boring_sqlstates.txt
 
 gitrev.h: $(HEADERS) $(SOURCES)
-	-if git describe --dirty --tags --always > /dev/null ; then \
-	echo "#define GITREV \"$$(git describe --dirty --tags --always)\"" > $@ ;\
+	-if git describe --exclude='debian*' --dirty --tags --always > /dev/null ; then \
+	echo "#define GITREV \"$$(git describe --exclude='debian*' --dirty --tags --always)\"" > $@ ;\
 	else \
 	echo "#define GITREV \"unreleased\"" > $@ ;\
 	fi