From 42afc3b5a35a706574e05d5a1ab1586b26ba03ef Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 7 Jan 2007 00:43:29 +0100 Subject: [PATCH] [MINOR] Makefile: git-log may return multiple dates in case of merges. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 906e8ee95..195e6a9fc 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.