Re: [PATCH v4 15/23] Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 19, 2021, 06:56 UTC
Message-ID: <xmqq7dd4sket.fsf@gitster.g>
In-Reply-To: <xmqqbl2gskxm.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 21 quoted lines

> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:
>
>> @@ -2238,12 +2235,7 @@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
>>  	$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
>>  	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(PAGER_ENV):\
>>  	$(perllibdir_SQ)
>> -GIT-SCRIPT-DEFINES: FORCE
>> -	@FLAGS='$(SCRIPT_DEFINES)'; \
>> -	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
>> -		echo >&2 "    * new script parameters"; \
>> -		echo "$$FLAGS" >$@; \
>> -            fi
>> +$(eval $(call TRACK_template,GIT-SCRIPT-DEFINES,SCRIPT_DEFINES))
>>  
>>  define cmd_munge_script
>>  sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
>
> Attempting to apply 1-14 on top of 'master' gets stuck here, as
> "GIT-SCRIPT-DEFINES: FORCE" appears after "define cmd_munge_script".
>
> Are you basing these patches on some unrelated work?

Ah, I figured it out. This wants to be applied after the ab/sh-retire-helper-functions topic graduates to 'master'.