The tag.gpgsign config option allows to sign all
commits automatically.
Signed-off-by: Laurent Arnoud <laurent@xxxxxxxxxx>
---
Documentation/config.txt | 3 +++
builtin/tag.c | 19 ++++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2cd6bdd..076c68a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2729,6 +2729,9 @@ submodule.<name>.ignore::
"--ignore-submodules" option. The 'git submodule' commands are not
affected by this setting.
+tag.gpgSign::
+ A boolean to specify whether all tags created should be GPG signed.
+
tag.sort::
This variable controls the sort ordering of tags when displayed by
linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
diff --git a/builtin/tag.c b/builtin/tag.c
index 1705c94..53cad28 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -29,6 +29,7 @@ static const char * const git_tag_usage[] = {
};
static unsigned int colopts;
+static const char *sign_tag;
static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
{
@@ -166,6 +167,11 @@ static int git_tag_config(const char *var, const char *value, void *cb)
status = git_gpg_config(var, value, cb);
if (status)
return status;
+ if (!strcmp(var, "tag.gpgsign")) {
+ sign_tag = git_config_bool(var, value) ? "" : NULL;
+ return 0;
+ }
+
if (starts_with(var, "column."))
return git_column_config(var, value, "tag", &colopts);
return git_default_config(var, value, cb);
@@ -381,14 +387,21 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, git_tag_usage, 0);
+ if (argc == 0 && !cmdmode)
+ cmdmode = 'l';
+
+ /* Remove config option when calling command other than create tag */
+ if (cmdmode != 0 && sign_tag)
+ sign_tag = NULL;
+
if (keyid) {
opt.sign = 1;
set_signing_key(keyid);
}
- if (opt.sign)
+ if (opt.sign || sign_tag) {
+ opt.sign = 1;
annotate = 1;
- if (argc == 0 && !cmdmode)
- cmdmode = 'l';
+ }
if ((annotate || msg.given || msgfile || force) && (cmdmode != 0))
usage_with_options(git_tag_usage, options);
--
2.7.0
--
Laurent
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html