upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make: do not show a diff on Private directory, minor regression in plugins

Browse source
This commit is contained in:
Franco Fichtner 2025-08-05 11:51:39 +02:00
parent 3d52a8203b
commit c7b3a87699
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mk/git.mk
View file

@ -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