summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Todd Zullinger <tmz@pobox.com>2022-03-04 11:25:18 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-04 11:36:41 -0800
commitfa47dd6445faea84300844f7d70fe22e710bdc22 (patch)
tree203ac64f1449a8ca3e6a5191f11556c05128f5d7 /t/t7610-mergetool.sh
parentgpg-interface/gpgsm: fix for v2.3 (diff)
downloadtgif-fa47dd6445faea84300844f7d70fe22e710bdc22.tar.xz
t/lib-gpg: reload gpg components after updating trustlist
With gpgsm from gnupg-2.3, the changes to the trustlist.txt do not appear to be picked up without refreshing the gpg-agent. Use the 'all' keyword to reload all of the gpg components. The scdaemon is started as a child of gpg-agent, for example. We used to have a --kill at this spot, but I removed it in 2e285e7803 (t/lib-gpg: drop redundant killing of gpg-agent, 2019-02-07). It seems like it might be necessary (again) for 2.3. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions