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 e

[PATCH v2 1/2] merge: add config option for verifySignatures

2017-12-09 Thread Hans Jerry Illikainen
tures. Signed-off-by: Hans Jerry Illikainen --- Documentation/merge-config.txt | 4 builtin/merge.c| 2 ++ t/t7612-merge-verify-signatures.sh | 39 ++ 3 files changed, 45 insertions(+) diff --git a/Documentation/merge-config.

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

2017-12-09 Thread Hans Jerry Illikainen
Add tests for pull --verify-signatures with untrusted, bad and no signatures. Previously the only test for --verify-signatures was to make sure that pull --rebase --verify-signatures result in a warning (t5520-pull.sh). Signed-off-by: Hans Jerry Illikainen --- t/t5573-pull-verify-signatures.sh

Re: [PATCH 3/3] pull: add config option for verifySignatures

2017-12-09 Thread Hans Jerry Illikainen
On Sat, Dec 09, 2017 at 01:06:23PM +0100, Kevin Daudt wrote: > On Sat, Dec 09, 2017 at 09:05:30AM +0000, Hans Jerry Illikainen wrote: > > Verify the signature of the tip commit when `pull.verifySignatures` is > > true. This option overrides `merge.verifySignatures` on pull,

[PATCH 1/3] merge: add config option for verifySignatures

2017-12-09 Thread Hans Jerry Illikainen
Verify the signature of the tip commit when `merge.verifySignatures` is true. This can be overridden with `--no-verify-signatures`. Signed-off-by: Hans Jerry Illikainen --- Documentation/merge-config.txt | 7 +++ builtin/merge.c| 2 ++ t/t7612-merge-verify

[PATCH 3/3] pull: add config option for verifySignatures

2017-12-09 Thread Hans Jerry Illikainen
Verify the signature of the tip commit when `pull.verifySignatures` is true. This option overrides `merge.verifySignatures` on pull, and can be disabled with the option `--no-verify-signatures`. Signed-off-by: Hans Jerry Illikainen --- Documentation/config.txt | 8 builtin

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

2017-12-09 Thread Hans Jerry Illikainen
Add tests for `pull --verify-signatures` with untrusted, bad and no signatures. Previously the only test for `--verify-signatures` was to make sure that `pull --rebase --verify-signatures` result in a warning (t5520-pull.sh). Signed-off-by: Hans Jerry Illikainen --- t/t5573-pull-verify