From 9cf28ac4fb67fd30e0704f80a2ac37984c8eb86f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 30 Jul 2025 13:34:46 +0200 Subject: [PATCH] make: turn feed auto-argument into runtime check It's using ensure-stable, but only when called. --- Mk/git.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/git.mk b/Mk/git.mk index 0bde7d681d..f100fca547 100644 --- a/Mk/git.mk +++ b/Mk/git.mk @@ -39,8 +39,6 @@ ${_TARGET}_ARG= ${${_TARGET}_ARGS:[0]} .endif .endfor -_feed_ARGS!= ${GITVERSION} ${CORE_STABLE} -feed_ARGS?= ${_feed_ARGS} diff_ARGS?= ${.CURDIR} mlog_ARGS?= ${.CURDIR} slog_ARGS?= ${.CURDIR} @@ -60,7 +58,9 @@ diff: ensure-stable fi feed: ensure-stable - @git log --stat -p --reverse ${CORE_STABLE}...${feed_ARGS:[1]}~1 ${.CURDIR} + @FEED="${feed_ARGS:[1]}"; \ + if [ -z "$${FEED}" ]; then FEED=$$(${GITVERSION} ${CORE_STABLE} | awk '{print $$1}'); fi; \ + git log --stat -p --reverse ${CORE_STABLE}...$${FEED}~1 ${.CURDIR} mfc: ensure-stable clean-mfcdir .for MFC in ${mfc_ARGS}