From 3745950a6b976e39a6506f2424dc4d84a0c5a092 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 16 Jul 2014 11:38:52 +0200 Subject: [PATCH] BUILD: report commit ID in git versions as well Currently, the commit ID appears in the sub-version in snapshots, but when people use the git repository, we only have the commits count, and not the last commit ID, which requires to count commits when troubleshooting. This change ensures that unreleased versions also report the commit ID before the commit number, such as : 1.6-dev0-bbfd1a-50 Tagged versions will not have this, since the post-release commit count is zero. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 707037b..0d1d13a 100644 --- a/Makefile +++ b/Makefile @@ -363,7 +363,7 @@ ifeq ($(IGNOREGIT),) VERSION := $(shell [ -d .git/. ] && ref=`(git describe --tags --match 'v*' --abbrev=0) 2>/dev/null` && ref=$${ref%-g*} && echo "$${ref\#v}") ifneq ($(VERSION),) # OK git is there and works. -SUBVERS := $(shell comms=`git log --format=oneline --no-merges v$(VERSION).. 2>/dev/null | wc -l | tr -dc '0-9'`; [ $$comms -gt 0 ] && echo "-$$comms") +SUBVERS := $(shell comms=`git log --format=oneline --no-merges v$(VERSION).. 2>/dev/null | wc -l | tr -dc '0-9'`; commit=`(git log -1 --pretty=%h --abbrev=6) 2>/dev/null`; [ $$comms -gt 0 ] && echo "-$$commit-$$comms") VERDATE := $(shell git log -1 --pretty=format:%ci | cut -f1 -d' ' | tr '-' '/') endif endif -- 1.7.10.4