summaryrefslogtreecommitdiff
path: root/t/t4046-diff-unmerged.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-13 22:56:17 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-13 22:56:17 +0000
commit21b839e606c173efa942dc282b3b6b542d7242f5 (patch)
treefe5770986ceb0aada8f0e07774b5aee1e0d1b5d0 /t/t4046-diff-unmerged.sh
parentMerge branch 'gc/parse-tree-indirect-errors' (diff)
parentt/lib-gpg: kill all gpg components, not just gpg-agent (diff)
downloadtgif-21b839e606c173efa942dc282b3b6b542d7242f5.tar.xz
Merge branch 'fs/gpgsm-update'
Newer version of GPGSM changed its output in a backward incompatible way to break our code that parses its output. It also added more processes our tests need to kill when cleaning up. Adjustments have been made to accommodate these changes. * fs/gpgsm-update: t/lib-gpg: kill all gpg components, not just gpg-agent t/lib-gpg: reload gpg components after updating trustlist gpg-interface/gpgsm: fix for v2.3
Diffstat (limited to 't/t4046-diff-unmerged.sh')
0 files changed, 0 insertions, 0 deletions