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 signed.
>
>  Needs tests, perhaps?

Besides, we would need at least something like this to make sure
that people have a way to selectively disable configured default
when necessary, perhaps like this.

-- >8 --
Subject: [PATCH] commit-tree: add and document --no-gpg-sign

Document how to override commit.gpgsign configuration that is set to
true per "git commit" invocation (parse-options machinery lets us
say "--no-gpg-sign" to do so).

"git commit-tree" does not use parse-options, so manually add the
corresponding option for now.

Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 Documentation/git-commit-tree.txt | 5 +++++
 Documentation/git-commit.txt      | 4 ++++
 builtin/commit-tree.c             | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/Documentation/git-commit-tree.txt 
b/Documentation/git-commit-tree.txt
index cafdc96..a469eab 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -55,8 +55,13 @@ OPTIONS
        from the standard input.
 
 -S[<keyid>]::
+--gpg-sign[=<keyid>]::
        GPG-sign commit.
 
+--no-gpg-sign::
+       Countermand `commit.gpgsign` configuration variable that is
+       set to force each and every commit to be signed.
+
 
 Commit Information
 ------------------
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 1a7616c..7c42e9c 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -302,6 +302,10 @@ configuration variable documented in linkgit:git-config[1].
 --gpg-sign[=<keyid>]::
        GPG-sign commit.
 
+--no-gpg-sign::
+       Countermand `commit.gpgsign` configuration variable that is
+       set to force each and every commit to be signed.
+
 \--::
        Do not interpret any more arguments as options.
 
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 1646d5b..4bf852d 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -71,6 +71,11 @@ int cmd_commit_tree(int argc, const char **argv, const char 
*prefix)
                        continue;
                }
 
+               if (!strcmp(arg, "--no-gpgsign")) {
+                       sign_commit = NULL;
+                       continue;
+               }
+
                if (!strcmp(arg, "-m")) {
                        if (argc <= ++i)
                                usage(commit_tree_usage);
-- 
1.8.5.1-272-g523f7c4


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to