mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'pt/am-builtin' into maint
When "git am" was rewritten as a built-in, it stopped paying attention to user.signingkey, which was fixed. * pt/am-builtin: am: configure gpg at startup
This commit is contained in:
commit
14f1467493
13
builtin/am.c
13
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"));
|
||||
|
||||
|
|
Loading…
Reference in a new issue