git/builtin/commit-tree.c, branch v2.6.2

commit-tree: simplify parsing of option -S using skip_prefix()

2014-12-29T17:32:45Z

Signed-off-by: Rene Scharfe Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

commit_tree: take a pointer/len pair rather than a const strbuf

2014-06-12T17:29:41Z

While strbufs are pretty common throughout our code, it is more flexible for functions to take a pointer/len pair than a strbuf. It's easy to turn a strbuf into such a pair (by dereferencing its members), but less easy to go the other way (you can strbuf_attach, but that has implications about memory ownership). This patch teaches commit_tree (and its associated callers and sub-functions) to take such a pair for the commit message rather than a strbuf. This makes passing the buffer around slightly more verbose, but means we can get rid of some dangerous strbuf_attach calls in the next patch. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

commit-tree: add and document --no-gpg-sign

2014-02-24T22:51:35Z

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

commit-tree: add the commit.gpgsign option to sign all commits

2014-02-24T22:50:56Z

If you want to GPG sign all your commits, you have to add the -S option all the time. The commit.gpgsign config option allows to sign all commits automatically. Signed-off-by: Nicolas Vigier Signed-off-by: Junio C Hamano

commit-tree: document -S option consistently

2013-03-25T22:01:22Z

Commit ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) added the -S option but documented it in the command usage without indicating that the value is optional and forgot to mention it in the manpage. Later commit 098bbdc3 (Add -S, --gpg-sign option to manpage of "git commit", 2012-10-21) documented the option in the porcelain manpage. Use wording from the porcelain manpage to document the option in the plumbing manpage. Also update the commit-tree usage summary to indicate that the -S value is optional to be consistent with the manpage and with the implementation. Signed-off-by: Brad King Signed-off-by: Junio C Hamano

Merge branch 'kk/maint-commit-tree'

2012-07-24T03:55:54Z

* kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates

Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree

2012-07-17T20:10:49Z

* kk/maint-1.7.9-commit-tree: commit-tree: resurrect command line parsing updates

commit-tree: resurrect command line parsing updates

2012-07-17T20:05:13Z

79a9312 (commit-tree: update the command line parsing, 2011-11-09) updated the command line parser to understand the usual "flags first and then non-flag arguments" order, in addition to the original and a bit unusual "tree comes first and then zero or more -p ". Unfortunately, ba3c69a (commit: teach --gpg-sign option, 2011-10-05) broke it by mistake. Resurrect it, and protect the feature with a test from future breakages. Noticed by Keshav Kini Signed-off-by: Junio C Hamano

commit-tree: the command wants a tree and commits

2012-07-09T23:42:22Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/show-sig'

2012-01-06T20:44:07Z

* jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c