From 603d8ce4c3c3aacd2028bd1fb4596d8fef7ca549 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 14 Aug 2018 19:16:55 +0300 Subject: Adapt to git_version() returning semantic_version now --- bpkg/fetch-git.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 8b09762..cbb80a1 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -11,7 +11,8 @@ #include // digit(), xdigit() #include #include // path_match() -#include +#include +#include // parse_standard_version() #include @@ -110,14 +111,14 @@ namespace bpkg co.git_option (), "--version")); - optional v (git_version (s)); + optional v (git_version (s)); if (!v) fail << "'" << s << "' doesn't appear to contain a git version" << info << "produced by '" << co.git () << "'; " << "use --git to override" << endg; - if (v->version < 20120000000) + if (*v < semantic_version {2, 12, 0}) fail << "unsupported git version " << *v << info << "minimum supported version is 2.12.0" << endf; -- cgit v1.1