From 69006ef0a7250c86d31bf660875ac8e7d0c8d156 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 10 Dec 2018 09:49:45 +0100
Subject: [PATCH] ENH: adjust wmakeBuildInfo to work with older git versions as
well
---
wmake/wmakeBuildInfo | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/wmake/wmakeBuildInfo b/wmake/wmakeBuildInfo
index 8aca435dbef..5914b310735 100755
--- a/wmake/wmakeBuildInfo
+++ b/wmake/wmakeBuildInfo
@@ -201,8 +201,9 @@ getMakeInfo()
patch="$(sed -ne 's@^patch *= *\([0-9][0-9]*\).*@\1@p' $metaInfoDir/build-info 2>/dev/null)"
fi
- # Build info from git
- build="$(git --git-dir=$WM_PROJECT_DIR/.git log -1 --date='format:%y%m%d' --format='%h-%ad' 2>/dev/null)"
+ # Build info from git. Use short date format (YYYY-MM-DD) and sed instead
+ # of the newer --date='format:%y%m%d'
+ build="$(git --git-dir=$WM_PROJECT_DIR/.git log -1 --date=short --format='%h=%ad' 2>/dev/null|sed 's/-//g;s/=/-/')"
# Branch info from git
if [ -n "$build" ]
--
GitLab