[PATCH] Allow usage of --gpg-sign flag in commit-tree builtin.
- From
Brandon Richardson <brandon1024.br@gmail.com>
- Date
- Jan 17, 2019, 19:29 UTC
- Message-ID
- <20190117192909.26064-1-brandon1024.br@gmail.com>
- In-Reply-To
- <y>
Signed-off-by: Brandon Richardson <brandon1024.br@gmail.com> --- Hi,
This is my first contribution, so please bear with me. All feedback is appreciated.
Ran into this issue while writing a signed commit object manually. Here are the steps I followed to replicate the issue:
mkdir test && cd test git init echo 'test' > test.txt git hash-object -w test.txt git update-index --add --cacheinfo 100644 <blob hash> test.txt git write-tree git commit-tree --gpg-sign -m 'test commit msg' <tree obj hash>
Thanks, Brandon
builtin/commit-tree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 9ec36a82b..9a06594f6 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -66,7 +66,9 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) continue; } - if (skip_prefix(arg, "-S", &sign_commit)) + if (skip_prefix(arg, "-S", &sign_commit) || + skip_prefix(arg, "--gpg-sign=", &sign_commit) || + skip_prefix(arg, "--gpg-sign", &sign_commit)) continue; if (!strcmp(arg, "--no-gpg-sign")) {
-- 2.20.1