summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 21:32:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-16 21:32:45 (GMT)
commit14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc (patch)
treefa9dd851bbbb17089b4101a2ccc6e2efbd19674e /builtin/am.c
parentdf64186f63fef8daef0fb4aedfa76aaf22b70b75 (diff)
parent434c64df669284af7e19fafd0ab496bc075cd24b (diff)
downloadgit-14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc.zip
git-14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc.tar.gz
git-14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc.tar.bz2
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
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 4f77e07..3bd4fd7 100644
--- a/builtin/am.c
+++ b/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"));