From c7b3a876994f2ecbf8a8a25755fedbb6be61e06c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 5 Aug 2025 11:51:39 +0200 Subject: [PATCH] make: do not show a diff on Private directory, minor regression in plugins --- Mk/git.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Mk/git.mk b/Mk/git.mk index daa7ee6702..e26c4ed075 100644 --- a/Mk/git.mk +++ b/Mk/git.mk @@ -50,11 +50,15 @@ ensure-stable: ${GIT} config branch.${CORE_STABLE}.remote origin; \ fi +.if exists(${.CURDIR}/Private) +GIT_PRIVATE= ':!Private/' +.endif + diff: ensure-stable @if [ "$$(${GIT} tag -l | grep -cx '${diff_ARGS:[1]}')" = "1" ]; then \ - ${GIT} diff --stat -p ${diff_ARGS:[1]}; \ + ${GIT} diff --stat -p ${diff_ARGS:[1]} ${GIT_PRIVATE}; \ else \ - ${GIT} diff --stat -p ${CORE_STABLE} ${diff_ARGS}; \ + ${GIT} diff --stat -p ${CORE_STABLE} ${diff_ARGS} ${GIT_PRIVATE}; \ fi feed: ensure-stable