diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-08-14 19:16:55 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-08-14 19:16:55 +0300 |
| commit | 603d8ce4c3c3aacd2028bd1fb4596d8fef7ca549 (patch) | |
| tree | dd0bdb94365deeda4cb48499457df78e0813e18e | |
| parent | f69203544b631d2e4eb7c8f151228cd5d8b9a8ed (diff) | |
Adapt to git_version() returning semantic_version now
| -rw-r--r-- | bpkg/fetch-git.cxx | 7 |
1 files 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 <libbutl/utility.mxx> // digit(), xdigit() #include <libbutl/process.mxx> #include <libbutl/filesystem.mxx> // path_match() -#include <libbutl/standard-version.mxx> +#include <libbutl/semantic-version.mxx> +#include <libbutl/standard-version.mxx> // parse_standard_version() #include <bpkg/diagnostics.hxx> @@ -110,14 +111,14 @@ namespace bpkg co.git_option (), "--version")); - optional<standard_version> v (git_version (s)); + optional<semantic_version> 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; |