diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:50 -0800 |
| commit | 0433d533f13671f4313c31e34707f0f5281a18e0 (patch) | |
| tree | 0b6e055b35fe853705118d32481d9c7602b3b331 /builtin | |
| parent | fc4a226bf60be67bc3d574aeafe06d266f700d99 (diff) | |
| parent | fb2afea366044fc2b4fff9929a06a1ca36f506df (diff) | |
| download | git-0433d533f13671f4313c31e34707f0f5281a18e0.tar.gz git-0433d533f13671f4313c31e34707f0f5281a18e0.tar.xz | |
Merge branch 'hi/merge-verify-sig-config'
"git merge" learned to pay attention to merge.verifySignatures
configuration variable and pretend as if '--verify-signatures'
option was given from the command line.
* hi/merge-verify-sig-config:
t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
t: add tests for pull --verify-signatures
merge: add config option for verifySignatures
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 612dd7bfb..30264cfd7 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -567,6 +567,8 @@ static int git_merge_config(const char *k, const char *v, void *cb) if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat")) show_diffstat = git_config_bool(k, v); + else if (!strcmp(k, "merge.verifysignatures")) + verify_signatures = git_config_bool(k, v); else if (!strcmp(k, "pull.twohead")) return git_config_string(&pull_twohead, k, v); else if (!strcmp(k, "pull.octopus")) |