From 07a012bb5577b9a9c01f18eea7cddbd31fea5727 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 28 Feb 2022 10:56:06 +0100 Subject: [PATCH] make: diff for tag if requested --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 99d30775a..86c240037 100644 --- a/Makefile +++ b/Makefile @@ -449,7 +449,11 @@ ensure-stable: fi diff: ensure-stable - @git diff --stat -p stable/${CORE_ABI} ${.CURDIR}/${diff_ARGS:[1]} + @if [ "$$(git tag -l | grep -cx '${diff_ARGS:[1]}')" = "1" ]; then \ + git diff --stat -p ${diff_ARGS:[1]}; \ + else \ + git diff --stat -p stable/${CORE_ABI} ${.CURDIR}/${diff_ARGS:[1]}; \ + fi mfc: ensure-stable clean-mfcdir .for MFC in ${mfc_ARGS} @@ -482,7 +486,7 @@ rebase: @git rebase -i @git checkout master -log: +log ensure-stable: @git log --stat -p stable/${CORE_ABI} push: