summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorBrandon Richardson <brandon1024.br@gmail.com>2019-01-19 23:23:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-22 19:08:35 (GMT)
commit70ddbd7767c24076975a176e734767facd3b5380 (patch)
treec46380ab713489717cb720424a95dd65794b957f /builtin/commit-tree.c
parent41a74bd01301d2976e7f9ab1ef55733f9ea1a919 (diff)
downloadgit-70ddbd7767c24076975a176e734767facd3b5380.zip
git-70ddbd7767c24076975a176e734767facd3b5380.tar.gz
git-70ddbd7767c24076975a176e734767facd3b5380.tar.bz2
commit-tree: add missing --gpg-sign flag
Add --gpg-sign option in commit-tree, which was documented, but not implemented, in 55ca3f99ae. Add tests for the --gpg-sign option. Signed-off-by: Brandon Richardson <brandon1024.br@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 9ec36a8..12cc403 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -66,7 +66,13 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
continue;
}
- if (skip_prefix(arg, "-S", &sign_commit))
+ if (!strcmp(arg, "--gpg-sign")) {
+ sign_commit = "";
+ continue;
+ }
+
+ if (skip_prefix(arg, "-S", &sign_commit) ||
+ skip_prefix(arg, "--gpg-sign=", &sign_commit))
continue;
if (!strcmp(arg, "--no-gpg-sign")) {