diff options
author | Brandon Richardson <brandon1024.br@gmail.com> | 2019-01-19 19:23:34 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-22 11:08:35 -0800 |
commit | 70ddbd7767c24076975a176e734767facd3b5380 (patch) | |
tree | c46380ab713489717cb720424a95dd65794b957f /builtin | |
parent | t7510: invoke git as part of &&-chain (diff) | |
download | tgif-70ddbd7767c24076975a176e734767facd3b5380.tar.xz |
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')
-rw-r--r-- | builtin/commit-tree.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 9ec36a82b6..12cc403bd7 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")) { |