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
.
An example of such problem :
http://svnweb.mageia.org/treasurer?view=revisionrevision=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 bo...@mars-attacks.org
---
git-svn.perl | 2 +-
1 file changed
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 bo...@mars-attacks.org
Thanks.
[...]
--- a/Documentation/git-rev-parse.txt
+++ b
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
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.
---
Documentation/config.txt | 10 +-
1 file
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 bo...@mars-attacks.org
---
Documentation/git-merge.txt | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
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[keyid], --gpg-sign[=keyid]'
to git-rebase, similar to the option
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 currently using optional arguments and could be
affected by this change.
Signed-off-by: Nicolas Vigier bo
On Tue, 15 Oct 2013, Junio C Hamano wrote:
Nicolas Vigier bo...@mars-attacks.org 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 followed by an other
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
echo $OPTIONS_SPEC | git rev-parse --parseopt $parseopt_extra
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 that is exactly why
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 'sticked'
options.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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
On Fri, 25 Oct 2013, Junio C Hamano wrote:
Nicolas Vigier bo...@mars-attacks.org 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) stick (past) stuck
(pp) stuck
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
.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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
The past participle of 'stick' is 'stuck'.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
Documentation/gitcli.txt | 6 +++---
Documentation/technical/api-parse-options.txt | 6 +++---
diff.c| 2 +-
diff.h
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
contrib/examples/git-checkout.sh | 1 +
contrib/examples/git-clean.sh| 1 +
contrib/examples/git-clone.sh| 1 +
contrib
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2 ++
sequencer.c | 7 +++
sequencer.h | 2 ++
5 files changed
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
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 bo...@mars-attacks.org
---
git-rebase.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/git
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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
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 bo...@mars-attacks.org
---
git-am.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/git-am.sh b/git
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 bo...@mars-attacks.org
---
git-rebase.sh | 50 ++
1 file changed, 22 insertions(+), 28 deletions
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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
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
@@ -37,6 +37,8 @@ struct replay_opts {
int mainline
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Helped-by: Brian M. Carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2 ++
sequencer.c | 11
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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
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 bo...@mars-attacks.org
---
Documentation/config.txt | 3 +++
builtin/commit-tree.c| 7
On Mon, 04 Nov 2013, Junio C Hamano wrote:
Nicolas Vigier bo...@mars-attacks.org 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 somewhat horrified to imagine
On Mon, 04 Nov 2013, Junio C Hamano wrote:
Nicolas Vigier bo...@mars-attacks.org 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 somewhat horrified to imagine
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 bo...@mars-attacks.org
---
The option description now suggests using an agent.
Documentation/config.txt
On Sun, 15 Dec 2013, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com 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
creates signed commits
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
---
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..537bfba76ecf 100755
--- a/t
34 matches
Mail list logo
