Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread John Keeping
On Sun, Mar 31, 2013 at 02:27:20PM +0200, Sebastian Götte wrote: > On 03/31/2013 02:16 PM, Thomas Rast wrote: > > "Sebastian Götte" wrote: > > > >> expecting success: > >> test_must_fail git merge --ff-only --verify-signatures side-untrusted > >> 2>mergeerror && > >>test_i18ngrep "has a

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Sebastian Götte
On 03/31/2013 02:16 PM, Thomas Rast wrote: > "Sebastian Götte" wrote: > >> expecting success: >> test_must_fail git merge --ff-only --verify-signatures side-untrusted >> 2>mergeerror && >>test_i18ngrep "has a good, untrusted GPG signature" mergeerror >> >> ==1430== Conditional jump or mo

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Thomas Rast
"Sebastian Götte" wrote: >expecting success: >test_must_fail git merge --ff-only --verify-signatures side-untrusted >2>mergeerror && >test_i18ngrep "has a good, untrusted GPG signature" mergeerror > >==1430== Conditional jump or move depends on uninitialised value(s) >==1430==at 0x4C

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Sebastian Götte
On 03/31/2013 01:38 PM, Thomas Rast wrote: > "Sebastian Götte" wrote: > >> On 03/31/2013 10:32 AM, Thomas Rast wrote: + test_must_fail git merge --ff-only --verify-signatures >> side-untrusted 2>mergeerror && + test_i18ngrep "from an untrusted key" mergeerror +' >>> >>> This test

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Thomas Rast
"Sebastian Götte" wrote: >On 03/31/2013 10:32 AM, Thomas Rast wrote: >>> + test_must_fail git merge --ff-only --verify-signatures >side-untrusted 2>mergeerror && >>> + test_i18ngrep "from an untrusted key" mergeerror >>> +' >> >> This test gives me the following: >> >> ==26527== Conditional

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Sebastian Götte
On 03/31/2013 10:32 AM, Thomas Rast wrote: > Sebastian Götte writes: > >> When --verify-signatures is specified, abort the merge in case a good >> GPG signature from an untrusted key is encountered. > [...] >> +test_expect_success GPG 'merge commit with untrusted signature with >> verification'

Re: [PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-31 Thread Thomas Rast
Sebastian Götte writes: > When --verify-signatures is specified, abort the merge in case a good > GPG signature from an untrusted key is encountered. [...] > +test_expect_success GPG 'merge commit with untrusted signature with > verification' ' ^

[PATCH v5 4/5] merge/pull Check for untrusted good GPG signatures

2013-03-29 Thread Sebastian Götte
When --verify-signatures is specified, abort the merge in case a good GPG signature from an untrusted key is encountered. Signed-off-by: Sebastian Götte --- Documentation/merge-options.txt| 4 ++-- builtin/merge.c| 2 ++ commit.c | 2 ++ co