diff options
| author | Fabian Stelzer <fs@gigacodes.de> | 2021-10-12 09:22:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 17:35:27 (GMT) |
| commit | 9d12546de9d75be70440e340a5f4bb6f9e41a89f (patch) | |
| tree | 42ad2525476dc7ee464d7755d58a7742ecd7a444 /fmt-merge-msg.c | |
| parent | e8191a52657ecfc12928cfe9eada80a883111ef2 (diff) | |
| download | git-9d12546de9d75be70440e340a5f4bb6f9e41a89f.zip git-9d12546de9d75be70440e340a5f4bb6f9e41a89f.tar.gz git-9d12546de9d75be70440e340a5f4bb6f9e41a89f.tar.bz2 | |
ssh signing: fmt-merge-msg tests & config parse
When merging a signed tag fmt-merge-msg was unable to verify its
validity missing the necessary ssh allowedSignersFile config.
Adds gpg config parsing to fmt-merge-msg.
Adds tests for ssh signed tags to fmt-merge-msg tests.
Signed-off-by: Fabian Stelzer <fs@gigacodes.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 2901c5e..5216191 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -9,6 +9,7 @@ #include "branch.h" #include "fmt-merge-msg.h" #include "commit-reach.h" +#include "gpg-interface.h" static int use_branch_desc; static int suppress_dest_pattern_seen; @@ -16,6 +17,8 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP; int fmt_merge_msg_config(const char *key, const char *value, void *cb) { + int status = 0; + if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { int is_bool; merge_log_config = git_config_bool_or_int(key, value, &is_bool); @@ -34,6 +37,9 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb) string_list_append(&suppress_dest_patterns, value); suppress_dest_pattern_seen = 1; } else { + status = git_gpg_config(key, value, NULL); + if (status) + return status; return git_default_config(key, value, cb); } return 0; |