diff options
| author |  Jeff King <peff@peff.net> | 2016-03-11 17:37:11 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-11 15:02:23 -0800 |
| commit | 94ce167249781d2c80ba28412d853c426d41a55a (patch) | |
| tree | 23817d0a97e4ff2482aae05a71d3a65d3831ec9e /builtin | |
| parent | setup: refactor repo format reading and verification (diff) | |
| download | tgif-94ce167249781d2c80ba28412d853c426d41a55a.tar.xz | |
init: use setup.c's repo version verification
We check our templates to make sure they are from a
version of git we understand (otherwise we would init a
repository we cannot ourselves run in!). But our simple
integer check has fallen behind the times. Let's use the
helpers that setup.c provides to do it right.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/init-db.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index e9b22569ff..d9934f3592 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -95,6 +95,8 @@ static void copy_templates(const char *template_dir) struct strbuf path = STRBUF_INIT; struct strbuf template_path = STRBUF_INIT; size_t template_len; + struct repository_format template_format; + struct strbuf err = STRBUF_INIT; DIR *dir; char *to_free = NULL; @@ -121,17 +123,18 @@ static void copy_templates(const char *template_dir) /* Make sure that template is from the correct vintage */ strbuf_addstr(&template_path, "config"); - repository_format_version = 0; - git_config_from_file(check_repository_format_version, - template_path.buf, NULL); + read_repository_format(&template_format, template_path.buf); strbuf_setlen(&template_path, template_len); - if (repository_format_version && - repository_format_version != GIT_REPO_VERSION) { - warning(_("not copying templates of " - "a wrong format version %d from '%s'"), - repository_format_version, - template_dir); + /* + * No mention of version at all is OK, but anything else should be + * verified. + */ + if (template_format.version >= 0 && + verify_repository_format(&template_format, &err) < 0) { + warning(_("not copying templates from '%s': %s"), + template_dir, err.buf); + strbuf_release(&err); goto close_free_return; } |