Re: [PATCH v2 0/9] add --gpg-sign to rebase and pull

2014-01-24 Thread Nicolas Vigier
On Fri, 24 Jan 2014, brian m. carlson wrote: > This series was posted to the list some time back, but it fell through > the cracks. This is a re-send of Nicolas Vigier's work with an > additional patch that adds --gpg-sign to pull as well. I added my > sign-off to his patches because SubmittingP

[PATCH] test the commit.gpgsign config option

2013-12-16 Thread Nicolas Vigier
t.gpgsign is true, "git rebase -f" creates signed commits Signed-off-by: Nicolas Vigier --- t/t7510-signed-commit.sh | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 1d3c56fe61fa..

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-16 Thread Nicolas Vigier
On Sun, 15 Dec 2013, Junio C Hamano wrote: > Junio C Hamano writes: > > > [Stalled] > > > > * nv/commit-gpgsign-config (2013-11-06) 1 commit > > - Add the commit.gpgsign option to sign all commits > > > > Introduce commit.gpgsign configuration variable to force every > > commit to be GPG sign

[PATCH] Add the commit.gpgsign option to sign all commits

2013-11-06 Thread Nicolas Vigier
If you want to GPG sign all your commits, you have to add the -S option all the time. The commit.gpgsign config option allows to sign all commits automatically. Signed-off-by: Nicolas Vigier --- The option description now suggests using an agent. Documentation/config.txt | 7 +++ builtin

Re: [PATCH] Add the commit.gpgsign option to sign all commits

2013-11-05 Thread Nicolas Vigier
On Mon, 04 Nov 2013, Junio C Hamano wrote: > Nicolas Vigier writes: > > > If you want to GPG sign all your commits, you have to add the -S option > > all the time. The commit.gpgsign config option allows to sign all > > commits automatically. > > I'm somewha

Re: [PATCH] Add the commit.gpgsign option to sign all commits

2013-11-04 Thread Nicolas Vigier
On Mon, 04 Nov 2013, Junio C Hamano wrote: > Nicolas Vigier writes: > > > If you want to GPG sign all your commits, you have to add the -S option > > all the time. The commit.gpgsign config option allows to sign all > > commits automatically. > > I'm somewha

[PATCH] Add the commit.gpgsign option to sign all commits

2013-11-04 Thread Nicolas Vigier
If you want to GPG sign all your commits, you have to add the -S option all the time. The commit.gpgsign config option allows to sign all commits automatically. Signed-off-by: Nicolas Vigier --- Documentation/config.txt | 3 +++ builtin/commit-tree.c| 7 ++- builtin/commit.c | 4

[PATCH] am: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier --- Second version of this patch. In the first version I forgot to save the status of the gpg-sign option so that it is also used with --continue. Documentation/git-am.txt | 6 +- git-am.sh| 11 ++- 2 files changed, 15 insertions(+), 2

[PATCH] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier Helped-by: Brian M. Carlson --- Documentation/git-cherry-pick.txt | 7 ++- Documentation/git-revert.txt | 6 +- builtin/revert.c | 2 ++ sequencer.c | 11 +++ sequencer.h | 2

Re: [PATCH 1/8] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
On Sun, 03 Nov 2013, brian m. carlson wrote: > On Sun, Nov 03, 2013 at 04:54:17PM +0100, Nicolas Vigier wrote: > > diff --git a/sequencer.h b/sequencer.h > > index 1fc22dcabe13..db43e9cf86dc 100644 > > --- a/sequencer.h > > +++ b/sequencer.h > > @@

[PATCH 7/8] rebase: parse options in stuck-long mode

2013-11-03 Thread Nicolas Vigier
There is no functionnal change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier --- git-rebase.sh | 50 ++ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/git

[PATCH 6/8] rebase: don't try to match -M option

2013-11-03 Thread Nicolas Vigier
The -M option does not exist in OPTIONS_SPEC, so there is no use to try to find it. Signed-off-by: Nicolas Vigier --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 6b9279a69028..2f2f8ded5c3f 100755 --- a/git-rebase.sh +++ b

[PATCH 5/8] rebase: remove useless arguments check

2013-11-03 Thread Nicolas Vigier
t; option, $# will be 3 or more if there are other options. - if --onto or -x doesn't have an argument, git rev-parse --parseopt will exit with an error and display usage information. Signed-off-by: Nicolas Vigier --- git-rebase.sh | 2 -- 1 file changed, 2 deletions(-) diff

[PATCH 8/8] rebase: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier --- Documentation/git-rebase.txt | 4 git-rebase--am.sh| 8 +--- git-rebase--interactive.sh | 32 git-rebase--merge.sh | 2 +- git-rebase.sh| 11 +++ 5 files changed, 41

[PATCH 3/8] am: parse options in stuck-long mode

2013-11-03 Thread Nicolas Vigier
There is no functionnal change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier --- git-am.sh | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/git-am.sh b/git-am.sh index a3b6f988229c

[PATCH 4/8] am: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier --- Documentation/git-am.txt | 6 +- git-am.sh| 9 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 54d8461d61b2..17924d0f3ff3 100644 --- a/Documentation/git

Adding --gpg-sign to cherry-pick, revert, am, rebase

2013-11-03 Thread Nicolas Vigier
Hello, Here is a series of patches to add the --gpg-sign option to be able to gpg sign commits, to the cherry-pick, revert, am and rebase commands. Nicolas -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

[PATCH 2/8] git-sh-setup.sh: add variable to use the stuck-long mode

2013-11-03 Thread Nicolas Vigier
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier --- contrib/examples/git-checkout.sh | 1 + contrib/examples/git-clean.sh| 1 + contrib/examples/git-clone.sh| 1 + contrib/examples/git-merge.sh

[PATCH 1/8] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier --- Documentation/git-cherry-pick.txt | 7 ++- Documentation/git-revert.txt | 6 +- builtin/revert.c | 2 ++ sequencer.c | 7 +++ sequencer.h | 2 ++ 5 files changed, 22 insertions(+), 2

[PATCH 1/2] Use the word 'stuck' instead of 'sticked'

2013-10-31 Thread Nicolas Vigier
The past participle of 'stick' is 'stuck'. Signed-off-by: Nicolas Vigier --- Documentation/gitcli.txt | 6 +++--- Documentation/technical/api-parse-options.txt | 6 +++--- diff.c

[PATCH 2/2] rev-parse --parseopt: add the --stuck-long mode

2013-10-31 Thread Nicolas Vigier
with short options. Signed-off-by: Nicolas Vigier --- Documentation/git-rev-parse.txt | 8 +++- builtin/rev-parse.c | 11 +-- t/t1502-rev-parse-parseopt.sh | 42 ++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/D

sticked -> stuck

2013-10-31 Thread Nicolas Vigier
Here is a patch to replace the word 'sticked' with 'stuck' in existing documentation. And the patch for nv/parseopt-opt-arg changed to use the word 'stuck' too. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo in

Re: [PATCH] rev-parse --parseopt: add the --sticked-long mode

2013-10-25 Thread Nicolas Vigier
On Fri, 25 Oct 2013, Junio C Hamano wrote: > Nicolas Vigier writes: > > > Add the --sticked-long option to output the options in their long form > > if available, and with their arguments sticked. > > Hmph, doesn't verb "stick" conjugate to "(present

[PATCH] rev-parse --parseopt: add the --sticked-long mode

2013-10-25 Thread Nicolas Vigier
ssible with short options. Signed-off-by: Nicolas Vigier --- Documentation/git-rev-parse.txt | 8 +++- builtin/rev-parse.c | 11 +-- t/t1502-rev-parse-parseopt.sh | 42 ++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff -

Re: [PATCH] rev-parse --parseopt: fix handling of optional arguments

2013-10-16 Thread Nicolas Vigier
On Tue, 15 Oct 2013, Jonathan Nieder wrote: > Junio C Hamano wrote: > > > You just made these two that the user clearly meant to express two > > different things indistinguishable. > > > > opt.sh -S > > opt.sh -S '' > [...] > > And that is exactly why gitcli.txt tells users to use the '

Re: [PATCH] rev-parse --parseopt: fix handling of optional arguments

2013-10-16 Thread Nicolas Vigier
On Wed, 16 Oct 2013, Johannes Sixt wrote: > Am 10/16/2013 1:57, schrieb Jonathan Nieder: > > Junio C Hamano wrote: > > > >> You just made these two that the user clearly meant to express two > >> different things indistinguishable. > >> > >>opt.sh -S > >> opt.sh -S '' > > [...] > >> And

Re: [PATCH] rev-parse --parseopt: fix handling of optional arguments

2013-10-15 Thread Nicolas Vigier
On Tue, 15 Oct 2013, Jonathan Nieder wrote: > Nicolas Vigier wrote: > > > $ cat /tmp/opt.sh > > #!/bin/sh > > OPTIONS_SPEC="\ > > git [options] > > -- > > q,quiet be quiet > > S,gpg-sign? GPG-sign commit&q

Re: [PATCH] rev-parse --parseopt: fix handling of optional arguments

2013-10-15 Thread Nicolas Vigier
On Tue, 15 Oct 2013, Junio C Hamano wrote: > Nicolas Vigier writes: > > > git rev-parse --parseopt does not allow us to see the difference > > between an option with an optional argument starting with a dash, and an > > option with an unset optional argument fol

[PATCH] rev-parse --parseopt: fix handling of optional arguments

2013-10-15 Thread Nicolas Vigier
-q set -- -S '' -q -- $ /tmp/opt.sh -S-q set -- -S '-q' -- We can now see if '-q' is an argument to '-S' or an other option. Also adding two tests in t1502. There does not seem to be any shell script git command included in git sources tree that is cur

Re: [PATCH] rev-parse doc: clarify use of optional / required arguments

2013-10-15 Thread Nicolas Vigier
On Mon, 14 Oct 2013, brian m. carlson wrote: > On Mon, Oct 14, 2013 at 05:25:29PM +0200, Nicolas Vigier wrote: > > The reason that I looked at this documentation in the first place was > > that I was looking at adding an option '-S[], --gpg-sign[=]' > > to git-rebas

[PATCH] git-merge: document the -S option

2013-10-14 Thread Nicolas Vigier
The option to gpg sign a merge commit is available but was not documented. Use wording from the git-commit(1) manpage. Signed-off-by: Nicolas Vigier --- Documentation/git-merge.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b

Re: [PATCH] config doc: user.signingkey is also used for signed commits

2013-10-14 Thread Nicolas Vigier
On Mon, 14 Oct 2013, Jonathan Nieder wrote: > Nicolas Vigier wrote: > > > The description of the user.signingkey option only mentioned its use > > when creating a signed tag. Make it clear that is is also used when > > creating signed commits. > > --- >

[PATCH] config doc: user.signingkey is also used for signed commits

2013-10-14 Thread Nicolas Vigier
The description of the user.signingkey option only mentioned its use when creating a signed tag. Make it clear that is is also used when creating signed commits. --- Documentation/config.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/D

Re: [PATCH] rev-parse doc: clarify use of optional / required arguments

2013-10-14 Thread Nicolas Vigier
On Mon, 14 Oct 2013, Jonathan Nieder wrote: > Nicolas Vigier wrote: > > > "the option is optional" was confusing as it is not the option but its > > argument which is optional. > > > > Signed-off-by: Nicolas Vigier > > Thanks. > > [...]

[PATCH] rev-parse doc: clarify use of optional / required arguments

2013-10-14 Thread Nicolas Vigier
"the option is optional" was confusing as it is not the option but its argument which is optional. Signed-off-by: Nicolas Vigier --- Documentation/git-rev-parse.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentati

[PATCH] git-svn: fix signed commit parsing

2013-09-30 Thread Nicolas Vigier
it message. An example of such problem : http://svnweb.mageia.org/treasurer?view=revision&revision=86 This commit changes the regex to only match an empty line as separator between the headers and the commit message. Signed-off-by: Nicolas Vigier --- git-svn.perl | 2 +- 1 file changed, 1 i