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/commit.c | |
parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
parent | 4b8d14b4c5d73dd4adb354d9689022d1b87828d5 (diff) | |
download | git-810273bc33b1f50191f90deef74277ee84174efd.tar.gz |
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/commit.c')
-rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 3767478c6d..9c51b129e8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1406,6 +1406,10 @@ static int git_commit_config(const char *k, const char *v, void *cb) } if (!strcmp(k, "commit.cleanup")) return git_config_string(&cleanup_arg, k, v); + if (!strcmp(k, "commit.gpgsign")) { + sign_commit = git_config_bool(k, v) ? "" : NULL; + return 0; + } status = git_gpg_config(k, v, NULL); if (status) |