[PATCH v2] am: configure gpg at startup
- From
- Renee Margaret McConahy <nepella@gmail.com>
- Date
- Sep 30, 2015, 17:49 UTC
- Message-ID
- <560c3c62.65086b0a.538a7.328a@mx.google.com>
- In-Reply-To
- <xmqqtwqb7lqn.fsf@gitster.mtv.corp.google.com>
The new builtin am ignores the user.signingkey variable: gpg is being called with the committer details as the key ID, which may not be correct. git_gpg_config is responsible for handling that variable and is expected to be called on initialization by any modules that use gpg.
Perhaps git_gpg_config's functionality ought to be merged into git_default_config, but this is simpler and in keeping with the current practice.
Signed-off-by: Renee Margaret McConahy <nepella@gmail.com> --- Oops, my bad. Thanks.
builtin/am.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c index 4f77e07..3bd4fd7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2208,6 +2208,17 @@ enum resume_mode { RESUME_ABORT }; +static int git_am_config(const char *k, const char *v, void *cb) +{ + int status; + + status = git_gpg_config(k, v, NULL); + if (status) + return status; + + return git_default_config(k, v, NULL); +} + int cmd_am(int argc, const char **argv, const char *prefix) { struct am_state state; @@ -2308,7 +2319,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_default_config, NULL); + git_config(git_am_config, NULL); am_state_init(&state, git_path("rebase-apply"));
-- 2.5.3