Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeremiah Mahler
On Wed, May 21, 2014 at 03:37:11PM -0700, Junio C Hamano wrote: > Jeremiah Mahler writes: > > > Below is one of the updated test cases. > > > > test_expect_success 'format-patch --signature-file=mail-signature' ' > > cat >mail-signature <<-\EOF > > > > Test User > > http://git.kernel

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Jeremiah Mahler writes: > On Wed, May 21, 2014 at 03:15:55PM -0700, Junio C Hamano wrote: >> Jeff King writes: >> >> Yeah, placing it in its own setup may be the best. There are quite >> a many set-ups outside the tests in this script from the olden days, >> so I am OK if left it as-is and hav

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Jeremiah Mahler writes: > Below is one of the updated test cases. > > test_expect_success 'format-patch --signature-file=mail-signature' ' > cat >mail-signature <<-\EOF > > Test User > http://git.kernel.org/cgit/git/git.git > > git.kernel.org/?p=git/git.git;a=summary > >

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeremiah Mahler
On Wed, May 21, 2014 at 03:15:55PM -0700, Junio C Hamano wrote: > Jeff King writes: > > Yeah, placing it in its own setup may be the best. There are quite > a many set-ups outside the tests in this script from the olden days, > so I am OK if left it as-is and have a separate clean-up patch after

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Jeff King writes: > I think he is responding to my earlier request to use test_must_fail > instead of "!". But there is a subtlety there he does not know, which > is that we typically only use the former for git programs, and rely on > "!" for normal Unix commands. Ok, that explains it. Thanks

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeremiah Mahler
On Wed, May 21, 2014 at 02:58:42PM -0700, Junio C Hamano wrote: > Jeremiah Mahler writes: > ... > The problem is a "cat" you added outside test_expect_*; the recent > push is to have as little executable outside them, especially the > "set-up" code to prepare for the real tests. > > i.e. we have

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeff King
On Wed, May 21, 2014 at 02:58:42PM -0700, Junio C Hamano wrote: > >> > ! grep "^-- \$" output > > ... > >> > >> We have been trying not to do the above in recent test updates. It > >> would be nice if this set-up did not have to be outside of the usual > >> test_expect_success structure

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Jeremiah Mahler writes: > On Wed, May 21, 2014 at 02:13:06PM -0700, Junio C Hamano wrote: >> Jeremiah Mahler writes: >> > ... >> >! grep "^-- \$" output > ... >> >> We have been trying not to do the above in recent test updates. It >> would be nice if this set-up did not have to be outsid

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeremiah Mahler
On Wed, May 21, 2014 at 02:13:06PM -0700, Junio C Hamano wrote: > Jeremiah Mahler writes: > ... > > ! grep "^-- \$" output ... > > We have been trying not to do the above in recent test updates. It > would be nice if this set-up did not have to be outside of the usual > test_expect_success

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Jeremiah Mahler
On Wed, May 21, 2014 at 02:24:27PM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > ... > > It seems you sent v7 before I had a chance to comment on this one. > The above was merely "it would be nicer..." and I am OK as-is. The > comments on the rest are a bit more serious, though. > >

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Junio C Hamano writes: > Jeremiah Mahler writes: > >> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh >> index 9c80633..049493d 100755 >> --- a/t/t4014-format-patch.sh >> +++ b/t/t4014-format-patch.sh >> @@ -762,6 +762,38 @@ test_expect_success 'format-patch --signature="" >> sup

Re: [PATCH v6] format-patch --signature-file

2014-05-21 Thread Junio C Hamano
Jeremiah Mahler writes: > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > index 9c80633..049493d 100755 > --- a/t/t4014-format-patch.sh > +++ b/t/t4014-format-patch.sh > @@ -762,6 +762,38 @@ test_expect_success 'format-patch --signature="" > suppresses signatures' ' > ! gr

[PATCH v6] format-patch --signature-file

2014-05-20 Thread Jeremiah Mahler
Added option that allows a signature file to be used with format-patch so that signatures with newlines and other special characters can be easily included. $ git format-patch --signature-file ~/.signature -1 The config variable format.signaturefile is also provided so that it can be added by d

[PATCH v6] format-patch --signature-file

2014-05-20 Thread Jeremiah Mahler
v6 of patch to add format-patch --signature-file option. This revision includes more suggestions from Jeff King and Junio C Hamano: - Adding #define DEFAULT_SIGNATURE was a good idea but it could be used in a way that nullifies the pointer comparison used to see if the default has chan