summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-13 15:40:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-24 14:51:35 -0800
commit55ca3f99ae4895605a348322dd2fc50f2065f508 (patch)
treecc01d0ad40b9320db83ac6ee3ac3ab5742ba1d8c /builtin/commit-tree.c
parentcommit-tree: add the commit.gpgsign option to sign all commits (diff)
downloadtgif-55ca3f99ae4895605a348322dd2fc50f2065f508.tar.xz
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>
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 1646d5b25e..987a4c3d73 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-gpg-sign")) {
+ sign_commit = NULL;
+ continue;
+ }
+
if (!strcmp(arg, "-m")) {
if (argc <= ++i)
usage(commit_tree_usage);