diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:03 -0800 |
| commit | 810273bc33b1f50191f90deef74277ee84174efd (patch) | |
| tree | c6295f6cd956f71be4044032f077e75f0d9b7237 /builtin/merge.c | |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
| parent | 4b8d14b4c5d73dd4adb354d9689022d1b87828d5 (diff) | |
| download | git-810273bc33b1f50191f90deef74277ee84174efd.tar.gz git-810273bc33b1f50191f90deef74277ee84174efd.tar.xz | |
Merge branch 'nv/commit-gpgsign-config'
Introduce commit.gpgsign configuration variable to force every
commit to be GPG signed. The variable cannot be overriden from the
command line of some of the commands that create commits except for
"git commit" and "git commit-tree", but I am not convinced that it
is a good idea to sprinkle support for --no-gpg-sign everywhere,
which in turn means that this configuration variable may not be
such a good idea.
* nv/commit-gpgsign-config:
test the commit.gpgsign config option
commit-tree: add and document --no-gpg-sign
commit-tree: add the commit.gpgsign option to sign all commits
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index e576a7fdc..f0cf1205f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -597,6 +597,9 @@ static int git_merge_config(const char *k, const char *v, void *cb) } else if (!strcmp(k, "merge.defaulttoupstream")) { default_to_upstream = git_config_bool(k, v); return 0; + } else if (!strcmp(k, "commit.gpgsign")) { + sign_commit = git_config_bool(k, v) ? "" : NULL; + return 0; } status = fmt_merge_msg_config(k, v, cb); |