From: Willy Tarreau Date: Sat, 6 Jan 2007 23:43:29 +0000 (+0100) Subject: [MINOR] Makefile: git-log may return multiple dates in case of merges. X-Git-Tag: v1.3.5~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42afc3b5a35a706574e05d5a1ab1586b26ba03ef;p=thirdparty%2Fhaproxy.git [MINOR] Makefile: git-log may return multiple dates in case of merges. --- diff --git a/Makefile b/Makefile index 906e8ee95d..195e6a9fca 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ endif 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 ^Date: | cut -f2- -d: | cut -f1 -d+)" ) +VERDATE := $(shell date +%Y/%m/%d -d "$$(git-log HEAD^.. 2>/dev/null | grep -m 1 ^Date: | cut -f2- -d: | cut -f1 -d+)" ) else # Otherwise, use the hard-coded version of last tag, number of changes # since last tag, and release date.