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

2013-03-31 Thread Thomas Rast
Sebastian Götte writes: > On 03/31/2013 05:03 PM, Thomas Rast wrote: } sigcheck_gpg_status[] = { { 'G', "[GNUPG:] GOODSIG " }, { 'B', "[GNUPG:] BADSIG " }, + { 'U', "[GNUPG:] TRUST_NEVER" }, + { 'U', "[GNUPG:] TRUST_UNDEFINED" }, [...] >> And furthermore, to use

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

2013-03-31 Thread John Keeping
On Sun, Mar 31, 2013 at 05:03:44PM +0200, Thomas Rast wrote: > John Keeping writes: > > > On Sun, Mar 31, 2013 at 04:33:57PM +0200, Sebastian Götte wrote: > >> diff --git a/commit.c b/commit.c > >> index eda7f90..bb2d9ad 100644 > >> --- a/commit.c > >> +++ b/commit.c > >> @@ -1029,6 +1029,8 @@ st

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

2013-03-31 Thread Sebastian Götte
On 03/31/2013 05:03 PM, Thomas Rast wrote: > John Keeping writes: > >> On Sun, Mar 31, 2013 at 04:33:57PM +0200, Sebastian Götte wrote: >>> diff --git a/commit.c b/commit.c >>> index eda7f90..bb2d9ad 100644 >>> --- a/commit.c >>> +++ b/commit.c >>> @@ -1029,6 +1029,8 @@ static struct { >>> } sig

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

2013-03-31 Thread Thomas Rast
John Keeping writes: > On Sun, Mar 31, 2013 at 04:33:57PM +0200, Sebastian Götte wrote: >> diff --git a/commit.c b/commit.c >> index eda7f90..bb2d9ad 100644 >> --- a/commit.c >> +++ b/commit.c >> @@ -1029,6 +1029,8 @@ static struct { >> } sigcheck_gpg_status[] = { >> { 'G', "[GNUPG:] GOODSI

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

2013-03-31 Thread John Keeping
On Sun, Mar 31, 2013 at 04:33:57PM +0200, Sebastian Götte wrote: > 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

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

2013-03-31 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 | 13 ++