diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mktag.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin/mktag.c b/builtin/mktag.c index 4dd35bc79e..373926d7e0 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -3,6 +3,14 @@ #include "replace-object.h" #include "object-store.h" #include "fsck.h" +#include "config.h" + +static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; + +static int mktag_config(const char *var, const char *value, void *cb) +{ + return fsck_config_internal(var, value, cb, &fsck_options); +} static int mktag_fsck_error_func(struct fsck_options *o, const struct object_id *oid, @@ -53,7 +61,6 @@ static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type) int cmd_mktag(int argc, const char **argv, const char *prefix) { struct strbuf buf = STRBUF_INIT; - struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; struct object_id tagged_oid; int tagged_type; struct object_id result; @@ -66,6 +73,8 @@ int cmd_mktag(int argc, const char **argv, const char *prefix) fsck_options.error_func = mktag_fsck_error_func; fsck_set_msg_type(&fsck_options, "extraheaderentry", "warn"); + /* config might set fsck.extraHeaderEntry=* again */ + git_config(mktag_config, NULL); if (fsck_tag_standalone(NULL, buf.buf, buf.len, &fsck_options, &tagged_oid, &tagged_type)) die("tag on stdin did not pass our strict fsck check"); |