{"thread":{"id":"33282","subject":"[PATCH] Documentation/commit-tree: mention -S option","startedAt":"2013-03-25T19:39:00Z","lastAt":"2013-03-25T21:00:07Z","messageCount":5,"participants":["Brad King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"212202","messageId":"14b024f9ee5c6319a0ff1f700f52d29b2464764f.1364240065.git.brad.king@kitware.com","threadId":"33282","inReplyTo":null,"subject":"[PATCH] Documentation/commit-tree: mention -S option","fromName":"Brad King","fromEmail":"brad.king@kitware.com","sentAt":"2013-03-25T19:39:00Z","receivedAt":"2013-03-25T19:39:00Z","isPatch":true,"sender":{"key":"brad.king@kitware.com","avatar":"https://avatars.githubusercontent.com/u/87268?v=4"},"body":"Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the\n-S option and documented it in the command usage. Then commit 098bbdc3\n(Add -S, --gpg-sign option to manpage of \"git commit\", 2012-10-21)\ndocumented it in the porcelain manpage. Use wording from the porcelain\nto document the option in the plumbing manpage too.\n---\n Documentation/git-commit-tree.txt | 7 ++++++-\n 1 file changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex 86ef56e..62f7b53 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -10,7 +10,9 @@ SYNOPSIS\n --------\n [verse]\n 'git commit-tree' [(-p )...] < changelog\n-'git commit-tree' [(-p )...] [(-m )...] [(-F )...] \n+'git commit-tree' [(-p )...] [-S] [(-m )...]\n+\t\t [(-F )...] \n+\n \n DESCRIPTION\n -----------\n@@ -52,6 +54,9 @@ OPTIONS\n \tRead the commit log message from the given file. Use `-` to read\n \tfrom the standard input.\n \n+-S::\n+\tGPG-sign commit.\n+\n \n Commit Information\n ------------------\n-- \n1.7.10.4\n"},{"id":"212207","messageId":"7v7gkvxn0b.fsf@alter.siamese.dyndns.org","threadId":"33282","inReplyTo":"14b024f9ee5c6319a0ff1f700f52d29b2464764f.1364240065.git.brad.king@kitware.com","subject":"Re: [PATCH] Documentation/commit-tree: mention -S option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-25T20:06:28Z","receivedAt":"2013-03-25T20:06:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brad King writes:\n\n> Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the\n> -S option and documented it in the command usage. Then commit 098bbdc3\n> (Add -S, --gpg-sign option to manpage of \"git commit\", 2012-10-21)\n> documented it in the porcelain manpage. Use wording from the porcelain\n> to document the option in the plumbing manpage too.\n> ---\n\nThanks; sign-off?\n\n> Documentation/git-commit-tree.txt | 7 ++++++-\n> 1 file changed, 6 insertions(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\n> index 86ef56e..62f7b53 100644\n> --- a/Documentation/git-commit-tree.txt\n> +++ b/Documentation/git-commit-tree.txt\n> @@ -10,7 +10,9 @@ SYNOPSIS\n> --------\n> [verse]\n> 'git commit-tree' [(-p )...] < changelog\n> -'git commit-tree' [(-p )...] [(-m )...] [(-F )...] \n> +'git commit-tree' [(-p )...] [-S] [(-m )...]\n> +\t\t [(-F )...] \n> +\n> \n> DESCRIPTION\n> -----------\n> @@ -52,6 +54,9 @@ OPTIONS\n> \tRead the commit log message from the given file. Use `-` to read\n> \tfrom the standard input.\n> \n> +-S::\n> +\tGPG-sign commit.\n> +\n> \n> Commit Information\n> ------------------\n"},{"id":"212211","messageId":"5150B062.9060303@kitware.com","threadId":"33282","inReplyTo":"7v7gkvxn0b.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/commit-tree: mention -S option","fromName":"Brad King","fromEmail":"brad.king@kitware.com","sentAt":"2013-03-25T20:15:30Z","receivedAt":"2013-03-25T20:15:30Z","isPatch":true,"sender":{"key":"brad.king@kitware.com","avatar":"https://avatars.githubusercontent.com/u/87268?v=4"},"body":"On 03/25/2013 04:06 PM, Junio C Hamano wrote:\n> Brad King writes:\n> \n>> Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the\n>> -S option and documented it in the command usage. Then commit 098bbdc3\n>> (Add -S, --gpg-sign option to manpage of \"git commit\", 2012-10-21)\n>> documented it in the porcelain manpage. Use wording from the porcelain\n>> to document the option in the plumbing manpage too.\n>> ---\n> \n> Thanks; sign-off?\n\nOops!\n\nSigned-off-by: Brad King \n\n-Brad\n"},{"id":"212221","messageId":"7vy5dbw6w2.fsf@alter.siamese.dyndns.org","threadId":"33282","inReplyTo":"14b024f9ee5c6319a0ff1f700f52d29b2464764f.1364240065.git.brad.king@kitware.com","subject":"Re: [PATCH] Documentation/commit-tree: mention -S option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-25T20:39:57Z","receivedAt":"2013-03-25T20:39:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brad King writes:\n\n> Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the\n> -S option and documented it in the command usage. Then commit 098bbdc3\n> (Add -S, --gpg-sign option to manpage of \"git commit\", 2012-10-21)\n> documented it in the porcelain manpage. Use wording from the porcelain\n> to document the option in the plumbing manpage too.\n> ---\n\nThis does not seem to use the same wording, though.\n\n\tgit commit -S\n\nwill pick up the signing key by calling get_signing_key() the same\nway \"git tag -s\" would, iow, part is optional.\n\n> Documentation/git-commit-tree.txt | 7 ++++++-\n> 1 file changed, 6 insertions(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\n> index 86ef56e..62f7b53 100644\n> --- a/Documentation/git-commit-tree.txt\n> +++ b/Documentation/git-commit-tree.txt\n> @@ -10,7 +10,9 @@ SYNOPSIS\n> --------\n> [verse]\n> 'git commit-tree' [(-p )...] < changelog\n> -'git commit-tree' [(-p )...] [(-m )...] [(-F )...] \n> +'git commit-tree' [(-p )...] [-S] [(-m )...]\n> +\t\t [(-F )...] \n> +\n> \n> DESCRIPTION\n> -----------\n> @@ -52,6 +54,9 @@ OPTIONS\n> \tRead the commit log message from the given file. Use `-` to read\n> \tfrom the standard input.\n> \n> +-S::\n> +\tGPG-sign commit.\n> +\n> \n> Commit Information\n> ------------------\n"},{"id":"212222","messageId":"caae961c52f65d96b0476b3d85739d1989fa1602.1364244915.git.brad.king@kitware.com","threadId":"33282","inReplyTo":"7vy5dbw6w2.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2] commit-tree: document -S option consistently","fromName":"Brad King","fromEmail":"brad.king@kitware.com","sentAt":"2013-03-25T21:00:07Z","receivedAt":"2013-03-25T21:00:07Z","isPatch":true,"sender":{"key":"brad.king@kitware.com","avatar":"https://avatars.githubusercontent.com/u/87268?v=4"},"body":"Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the\n-S option but documented it in the command usage without indicating that\nthe value is optional and forgot to mention it in the manpage. Later\ncommit 098bbdc3 (Add -S, --gpg-sign option to manpage of \"git commit\",\n2012-10-21) documented the option in the porcelain manpage.\n\nUse wording from the porcelain manpage to document the option in the\nplumbing manpage. Also update the commit-tree usage summary to indicate\nthat the -S value is optional to be consistent with the manpage and with\nthe implementation.\n\nSigned-off-by: Brad King \n---\n\nOn 03/25/2013 04:39 PM, Junio C Hamano wrote:\n> This does not seem to use the same wording, though.\n> \n> \tgit commit -S\n> \n> will pick up the signing key by calling get_signing_key() the same\n> way \"git tag -s\" would, iow, part is optional.\n\nAhh, I was fooled by the commit-tree usage synopsis and didn't\nread deeply enough into the implementation. Here is an updated\npatch to cover that too.\n\n Documentation/git-commit-tree.txt | 7 ++++++-\n builtin/commit-tree.c | 2 +-\n 2 files changed, 7 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex 86ef56e..cafdc96 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -10,7 +10,9 @@ SYNOPSIS\n --------\n [verse]\n 'git commit-tree' [(-p )...] < changelog\n-'git commit-tree' [(-p )...] [(-m )...] [(-F )...] \n+'git commit-tree' [(-p )...] [-S[]] [(-m )...]\n+\t\t [(-F )...] \n+\n \n DESCRIPTION\n -----------\n@@ -52,6 +54,9 @@ OPTIONS\n \tRead the commit log message from the given file. Use `-` to read\n \tfrom the standard input.\n \n+-S[]::\n+\tGPG-sign commit.\n+\n \n Commit Information\n ------------------\ndiff --git a/builtin/commit-tree.c b/builtin/commit-tree.c\nindex eac901a..f641ff2 100644\n--- a/builtin/commit-tree.c\n+++ b/builtin/commit-tree.c\n@@ -10,7 +10,7 @@\n #include \"utf8.h\"\n #include \"gpg-interface.h\"\n \n-static const char commit_tree_usage[] = \"git commit-tree [(-p )...] [-S] [-m ] [-F ] )...] [-S[]] [-m ] [-F ]