kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-10-16 14:32:45 -07:00
parent df64186f63 434c64df66
commit 14f1467493
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

@ -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"));