Merge pull request #3314 from sysown/v2.1.1_cluster_os_check

Change git_version parsing to standardize across OS versions
sysown · Feb 24, 2021 · 6d49f5f · 6d49f5f
2 parents 5f269af + ab3b049
commit 6d49f5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
+GIT_VERSION := $(shell git describe --long --abbrev=7)
 ifndef GIT_VERSION
 $(error GIT_VERSION is not set)
 endif

diff --git a/lib/Makefile b/lib/Makefile
@@ -1,5 +1,5 @@
 ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
+GIT_VERSION := $(shell git describe --long --abbrev=7)
 ifndef GIT_VERSION
 $(error GIT_VERSION is not set)
 endif

diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,5 @@
 ifndef GIT_VERSION
-GIT_VERSION := $(shell git describe --long)
+GIT_VERSION := $(shell git describe --long --abbrev=7)
 ifndef GIT_VERSION
 $(error GIT_VERSION is not set)
 endif