Re: Re* [PATCH v2 2/2] t: add tests for pull --verify-signatures

2017-12-16 Thread Junio C Hamano
Hans Jerry Illikainen writes: > Thanks! t7612-merge-verify-signatures.sh also lacks cleanup for > test_must_fail brokenness. Would you prefer test_when_finished to be > included in the two patches as a v3? No, I do not want a v3 as these are already in 'next'. Just like my

Re: Re* [PATCH v2 2/2] t: add tests for pull --verify-signatures

2017-12-16 Thread Hans Jerry Illikainen
On Fri, Dec 15, 2017 at 11:48:29AM -0800, Junio C Hamano wrote: > Here is what I would propose as a follow-up polishing. > > -- >8 -- > Subject: [PATCH 3/2] t5573: clean up after unexpected success of 'pull', too > > The previous step added test_when_finished to tests that run 'git > pull' with

Re* [PATCH v2 2/2] t: add tests for pull --verify-signatures

2017-12-15 Thread Junio C Hamano
Junio C Hamano writes: > Interestingly, the tests that do expect 'git pull' to succeed > protect themselves with "when-finished" mechanism correctly [*1*], > like so: > >> +test_expect_success GPG 'pull signed commit with --verify-signatures' ' >> +test_when_finished "git

Re: [PATCH v2 2/2] t: add tests for pull --verify-signatures

2017-12-12 Thread Junio C Hamano
Hans Jerry Illikainen writes: > +test_expect_success GPG 'pull unsigned commit with --verify-signatures' ' > + test_must_fail git pull --ff-only --verify-signatures unsigned > 2>pullerror && > + test_i18ngrep "does not have a GPG signature" pullerror > +' Note that