Re: [PATCH] t1016: make sure to use specified GPG
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 12, 2025, 15:11 UTC
- Message-ID
- <xmqq1pn85f5i.fsf@gitster.g>
- In-Reply-To
- <aOu59eVs7tK6pCoF@teonanacatl.net>
Todd Zullinger <tmz@pobox.com> writes:
Show 22 quoted lines
> Interesting. And well-spotted. > > This _does_ seem to resolve the failures in our CI and in > the Fedora build system. I was able to run a few test > builds. With this fix, the tests were successful where they > were not without it. > > I remember suspecting the gpg calls were not using the > wrapper command in gpg.program. I even tried forcing the > --faked-system-time for all the tests to check that theory, > unsuccessfully. > > Oddly, I ran into test failures after fixing the GPG2 prereq > long before c348192afe (t1016: clean up style, 2024-10-22) > was in place. Perhaps I was hitting a different issue > initially? Then, when I looked at it again I didn't think > about gpg.program again, since I'd already tried to force > the gpg wrapper which sets --faked-system-time. > > It's both annoying and embarrassing if it is that simple and > I missed it after looking a few times, to be sure. But I'll > be happy with the end result all the same. :)
FWIW, GitHub CI jobs are failing t1016 at the tip of 'seen' (which has this change), but only some and not all the jobs, which may indicate there are timeing-dependent flakes involved. I didn't dig further, though.
Show 16 quoted lines
>> t/t1016-compatObjectFormat.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh
>> index 8341a2fe83..cb6d308f1d 100755
>> --- a/t/t1016-compatObjectFormat.sh
>> +++ b/t/t1016-compatObjectFormat.sh
>> @@ -116,7 +116,7 @@ do
>> git config core.repositoryformatversion 1 &&
>> git config extensions.objectformat $hash &&
>> git config extensions.compatobjectformat $(compat_hash $hash) &&
>> - test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
>> + git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
>> echo "Hello World!" >hello &&
>> eval hello_${hash}_oid=$(git hash-object hello) &&
>> git update-index --add hello &&