From 3398b35c047d97b22a52f4dc4a0d5eabf50a96ef Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sun, 27 Apr 2014 14:38:15 +0200 Subject: build: Also use proper previous tag for people list Follow up for commit 311d4376 ("build: Make sure we get the correct previous tag for the changelog"). Move getting the previous tag into an own command and use it where appropriate. Signed-off-by: Tobias Klauser --- Cmds | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cmds b/Cmds index 03ff956..9d2675f 100644 --- a/Cmds +++ b/Cmds @@ -37,12 +37,13 @@ RMDIR = echo -e " RM\t$(1)" && rmdir --ignore-fail-on-non-empty $(1) 2> /dev/nu GZIP = gzip --best -c # Git related +GIT_LAST_TAG = git describe --abbrev=0 v$(VERSION_SHORT)^ GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_SHORT)/ v$(VERSION_SHORT) | \ $(1) > ../netsniff-ng-$(VERSION_SHORT).tar.$(2) GIT_TAG = git tag -a v$(VERSION_SHORT) -s -m "$(VERSION_SHORT) release" -GIT_LOG = git shortlog -n $(shell git describe --abbrev=0 v$(VERSION_SHORT)^)..HEAD +GIT_LOG = git shortlog -n $(shell $(GIT_LAST_TAG))..HEAD GIT_REM = git ls-files -o | xargs rm -rf -GIT_PEOPLE = git log --no-merges $(shell git tag | tail -n2 | head -n1)..HEAD | grep Author: | cut -d: -f2 | \ +GIT_PEOPLE = git log --no-merges $(shell $(GIT_LAST_TAG))..HEAD | grep Author: | cut -d: -f2 | \ cut -d\< -f1 | sort | uniq -c | sort -nr GIT_VERSION = git describe --always -- cgit v1.2.3-54-g00ecf