development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pt/am-builtin'

Browse source 
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:
Junio C Hamano 2015-10-15 15:43:40 -07:00
parent b9d23c2110 434c64df66
commit 51a0908a6f
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"));