undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: configure gpg at startup

Browse Source 
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.

Signed-off-by: Renee Margaret McConahy <nepella@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Renee Margaret McConahy 2015-09-30 13:49:44 -04:00 committed by Junio C Hamano
parent 1fb5a0ea96
commit 434c64df66
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/am.c
View File

@ -2125,6 +2125,17 @@ enum resume_mode {
RESUME_ABORT 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) int cmd_am(int argc, const char **argv, const char *prefix)
{ {
struct am_state state; struct am_state state;
@ -2223,7 +2234,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
git_config(git_default_config, NULL); git_config(git_am_config, NULL);
am_state_init(&state, git_path("rebase-apply")); am_state_init(&state, git_path("rebase-apply"));