From: Willy Tarreau Date: Tue, 14 Jul 2009 11:24:16 +0000 (+0200) Subject: [BUILD] report commit date and not author's date as build date X-Git-Tag: v1.4-dev1~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=446024e7fb5faef86cd6e2c0aba3c4524ad77705;p=thirdparty%2Fhaproxy.git [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. --- diff --git a/Makefile b/Makefile index d5bd2fda09..e790fe8c7e 100644 --- a/Makefile +++ b/Makefile @@ -268,8 +268,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 | sed -ne '/^Date:/{s/\(^[^ ]*:\)\|\( [-+].*\)//gp;q}'`" ) +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