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 <gitster@pobox.com>
maint
Junio C Hamano 2013-12-13 15:40:35 -08:00
parent d95bfb12b8
commit 55ca3f99ae
3 changed files with 14 additions and 0 deletions

View File

@ -55,8 +55,13 @@ OPTIONS
from the standard input. from the standard input.


-S[<keyid>]:: -S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign commit. 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 Commit Information
------------------ ------------------

View File

@ -302,6 +302,10 @@ configuration variable documented in linkgit:git-config[1].
--gpg-sign[=<keyid>]:: --gpg-sign[=<keyid>]::
GPG-sign commit. 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. Do not interpret any more arguments as options.



View File

@ -71,6 +71,11 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
continue; continue;
} }


if (!strcmp(arg, "--no-gpg-sign")) {
sign_commit = NULL;
continue;
}

if (!strcmp(arg, "-m")) { if (!strcmp(arg, "-m")) {
if (argc <= ++i) if (argc <= ++i)
usage(commit_tree_usage); usage(commit_tree_usage);