Renee Margaret McConahy <nepe...@gmail.com> writes:
> 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 <nepe...@gmail.com>
> ---
Thanks.
I'd remove the unused "flags" (already pointed out by somebody, I
think), but otherwise the change looks sensible.
> builtin/am.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/am.c b/builtin/am.c
> index 4f77e07..f0b0ffd 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -2208,6 +2208,18 @@ enum resume_mode {
> RESUME_ABORT
> };
>
> +static int git_am_config(const char *k, const char *v, void *cb)
> +{
> + int *flags = 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 +2320,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"));
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
