From 3157b9bde997669b4cce627cb4f3b0eed1760e6b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 14 Jul 2009 13:24:16 +0200 Subject: [PATCH] [BUILD] report commit date and not author's date as build date By default, when building from a git tree, haproxy's release date is set to the last commit's date. But it was the wrong date which was used, the initial patch's date, which can cause time jumps in the past when an old patch gets merged. What we want is the commit date, which reflects the correct code history. (cherry picked from commit 446024e7fb5faef86cd6e2c0aba3c4524ad77705) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1d22eba21..bf268f35c 100644 --- a/Makefile +++ b/Makefile @@ -258,8 +258,8 @@ ifeq ($(IGNOREGIT),) VERSION := $(shell [ -d .git/. ] && ref=`(git-describe --tags) 2>/dev/null` && ref=$${ref%-g*} && echo "$${ref\#v}") ifneq ($(VERSION),) # OK git is there and works. -SUBVERS := $(shell comms=`git-log --no-merges v$(VERSION).. 2>/dev/null |grep -c ^commit `; [ $$comms -gt 0 ] && echo "-$$comms" ) -VERDATE := $(shell date +%Y/%m/%d -d "`git-log HEAD^.. 2>/dev/null | grep -m 1 ^Date: | cut -f2- -d: | cut -f1 -d+`" ) +SUBVERS := $(shell comms=`git log --no-merges v$(VERSION).. 2>/dev/null |grep -c ^commit `; [ $$comms -gt 0 ] && echo "-$$comms" ) +VERDATE := $(shell date +%Y/%m/%d -d "`git log --pretty=fuller HEAD^.. 2>/dev/null | sed -ne '/^CommitDate:/{s/\(^[^ ]*:\)\|\( [-+].*\)//gp;q}'`" ) endif endif -- 2.47.3