From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v5 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign
Date: Tue, 7 Jul 2015 22:20:49 +0800 [thread overview]
Message-ID: <1436278862-2638-32-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1436278862-2638-1-git-send-email-pyokagan@gmail.com>
Since 3b4e395 (am: add the --gpg-sign option, 2014-02-01), git-am.sh
supported the --gpg-sign option, and would pass it to git-commit-tree,
thus GPG-signing the commit object.
Re-implement this option in builtin/am.c.
git-commit-tree would also sign the commit by default if the
commit.gpgsign setting is true. Since we do not run commit-tree, we
re-implement this behavior by handling the commit.gpgsign setting
ourselves.
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
Notes:
v5
* Renamed local "sign_commit" variable in am_state_init() to "gpgsign"
to aid code review.
builtin/am.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c
index d7bb159..81b3e31 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -124,6 +124,8 @@ struct am_state {
int ignore_date;
+ const char *sign_commit;
+
int rebasing;
};
@@ -133,6 +135,8 @@ struct am_state {
*/
static void am_state_init(struct am_state *state, const char *dir)
{
+ int gpgsign;
+
memset(state, 0, sizeof(*state));
assert(dir);
@@ -149,6 +153,9 @@ static void am_state_init(struct am_state *state, const char *dir)
state->scissors = SCISSORS_UNSET;
argv_array_init(&state->git_apply_opts);
+
+ if (!git_config_get_bool("commit.gpgsign", &gpgsign))
+ state->sign_commit = gpgsign ? "" : NULL;
}
/**
@@ -1266,7 +1273,7 @@ static void do_commit(const struct am_state *state)
state->ignore_date ? "" : state->author_date, 1);
if (commit_tree(state->msg, state->msg_len, tree, parents, commit,
- author, NULL))
+ author, state->sign_commit))
die(_("failed to write commit object"));
reflog_msg = getenv("GIT_REFLOG_ACTION");
@@ -1688,6 +1695,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
N_("lie about committer date")),
OPT_BOOL(0, "ignore-date", &state.ignore_date,
N_("use current timestamp for author date")),
+ { OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
+ N_("GPG-sign commits"),
+ PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
N_("(internal use for git-rebase)")),
OPT_END()
--
2.5.0.rc1.76.gf60a929
next prev parent reply other threads:[~2015-07-07 14:23 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 14:20 [PATCH v5 00/44] Make git-am a builtin Paul Tan
2015-07-07 14:20 ` [PATCH v5 01/44] wrapper: implement xopen() Paul Tan
2015-07-07 14:20 ` [PATCH v5 02/44] wrapper: implement xfopen() Paul Tan
2015-07-07 14:20 ` [PATCH v5 03/44] builtin-am: implement skeletal builtin am Paul Tan
2015-07-07 14:20 ` [PATCH v5 04/44] builtin-am: implement patch queue mechanism Paul Tan
2015-07-07 14:20 ` [PATCH v5 05/44] builtin-am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-07-07 14:20 ` [PATCH v5 06/44] builtin-am: auto-detect mbox patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 07/44] builtin-am: extract patch and commit info with git-mailinfo Paul Tan
2015-07-07 14:20 ` [PATCH v5 08/44] builtin-am: apply patch with git-apply Paul Tan
2015-07-07 14:20 ` [PATCH v5 09/44] builtin-am: implement committing applied patch Paul Tan
2015-07-07 14:20 ` [PATCH v5 10/44] builtin-am: refuse to apply patches if index is dirty Paul Tan
2015-07-07 14:20 ` [PATCH v5 11/44] builtin-am: implement --resolved/--continue Paul Tan
2015-07-07 14:20 ` [PATCH v5 12/44] builtin-am: implement --skip Paul Tan
2015-07-13 19:05 ` Stefan Beller
2015-07-14 9:34 ` Paul Tan
2015-07-14 16:54 ` Stefan Beller
2015-07-18 15:22 ` Paul Tan
2015-07-07 14:20 ` [PATCH v5 13/44] builtin-am: implement --abort Paul Tan
2015-07-07 14:20 ` [PATCH v5 14/44] builtin-am: reject patches when there's a session in progress Paul Tan
2015-07-07 14:20 ` [PATCH v5 15/44] builtin-am: implement -q/--quiet Paul Tan
2015-07-07 14:20 ` [PATCH v5 16/44] builtin-am: exit with user friendly message on failure Paul Tan
2015-07-07 14:20 ` [PATCH v5 17/44] builtin-am: implement -s/--signoff Paul Tan
2015-07-07 14:20 ` [PATCH v5 18/44] cache-tree: introduce write_index_as_tree() Paul Tan
2015-07-07 20:10 ` Junio C Hamano
2015-07-07 14:20 ` [PATCH v5 19/44] builtin-am: implement --3way, am.threeWay Paul Tan
2015-07-07 20:14 ` Junio C Hamano
2015-07-14 9:32 ` Paul Tan
2015-07-07 14:20 ` [PATCH v5 20/44] builtin-am: implement --rebasing mode Paul Tan
2015-07-07 14:20 ` [PATCH v5 21/44] builtin-am: bypass git-mailinfo when --rebasing Paul Tan
2015-07-07 14:20 ` [PATCH v5 22/44] builtin-am: handle stray state directory Paul Tan
2015-07-07 14:20 ` [PATCH v5 23/44] builtin-am: implement -u/--utf8 Paul Tan
2015-07-07 14:20 ` [PATCH v5 24/44] builtin-am: implement -k/--keep, --keep-non-patch Paul Tan
2015-07-07 14:20 ` [PATCH v5 25/44] builtin-am: implement --[no-]message-id, am.messageid Paul Tan
2015-07-07 14:20 ` [PATCH v5 26/44] builtin-am: support --keep-cr, am.keepcr Paul Tan
2015-07-07 14:20 ` [PATCH v5 27/44] builtin-am: implement --[no-]scissors Paul Tan
2015-07-07 14:20 ` [PATCH v5 28/44] builtin-am: pass git-apply's options to git-apply Paul Tan
2015-07-07 14:20 ` [PATCH v5 29/44] builtin-am: implement --ignore-date Paul Tan
2015-07-07 14:20 ` [PATCH v5 30/44] builtin-am: implement --committer-date-is-author-date Paul Tan
2015-07-07 14:20 ` Paul Tan [this message]
2015-07-07 14:20 ` [PATCH v5 32/44] builtin-am: invoke post-rewrite hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 33/44] builtin-am: support automatic notes copying Paul Tan
2015-07-07 14:20 ` [PATCH v5 34/44] builtin-am: invoke applypatch-msg hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 35/44] builtin-am: invoke pre-applypatch hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 36/44] builtin-am: invoke post-applypatch hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 37/44] builtin-am: rerere support Paul Tan
2015-07-07 14:20 ` [PATCH v5 38/44] builtin-am: support and auto-detect StGit patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 39/44] builtin-am: support and auto-detect StGit series files Paul Tan
2015-07-07 14:20 ` [PATCH v5 40/44] builtin-am: support and auto-detect mercurial patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 41/44] builtin-am: implement -i/--interactive Paul Tan
2015-07-07 14:21 ` [PATCH v5 42/44] builtin-am: implement legacy -b/--binary option Paul Tan
2015-07-07 14:21 ` [PATCH v5 43/44] builtin-am: check for valid committer ident Paul Tan
2015-07-07 14:21 ` [PATCH v5 44/44] builtin-am: remove redirection to git-am.sh Paul Tan
2015-07-07 18:52 ` [PATCH v5 00/44] Make git-am a builtin Junio C Hamano
2015-07-07 19:25 ` Paul Tan
2015-07-08 7:31 ` Junio C Hamano
2015-07-08 7:44 ` Paul Tan
2015-07-08 7:48 ` Junio C Hamano
2015-07-08 8:19 ` Paul Tan
2015-07-09 6:00 ` Junio C Hamano
2015-07-12 12:29 ` Paul Tan
2015-07-12 17:32 ` Junio C Hamano
2015-07-13 22:31 ` Junio C Hamano
2015-07-14 10:08 ` Paul Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436278862-2638-32-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).