From d3ef22615ba7d37be18c31b2fdd1bdb6be164939 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 15 Feb 2018 22:49:37 +0300 Subject: Raise minimum supported git version to 2.12.0 from 2.11.0 --- bpkg/fetch-git.cxx | 6 +++--- tests/remote-git.test | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 3dbb4eb..fa9723c 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -99,7 +99,7 @@ namespace bpkg static string git_string (const common_options&, const char* what, A&&... args); - // Start git process. On the first call check that git version is 2.11.0 or + // Start git process. On the first call check that git version is 2.12.0 or // above, and fail if that's not the case. // // Note that git is executed in the "sanitized" environment, having the @@ -169,9 +169,9 @@ namespace bpkg if (v.empty ()) fail << "unable to obtain git version from '" << s << "'" << endg; - if (v.version < 20110000000) + if (v.version < 20120000000) fail << "unsupported git version " << v.string () << - info << "minimum supported version is 2.11.0" << endf; + info << "minimum supported version is 2.12.0" << endf; // Sanitize the environment. // diff --git a/tests/remote-git.test b/tests/remote-git.test index 5214b35..5283b91 100644 --- a/tests/remote-git.test +++ b/tests/remote-git.test @@ -11,7 +11,7 @@ # contain repositories produced) are not cleaned up. # -# Check that git version is the minimum supported one (2.11.0) or above. +# Check that git version is the minimum supported one (2.12.0) or above. # +git --version | set git_version_out @@ -26,7 +26,7 @@ end +echo "$git_version" | sed -e 's/\d+\.(\d+).*/\1/' | set git_version_minor git_supported = ($git_version_major > 2 || \ - $git_version_major == 2 && $git_version_minor >= 11) + $git_version_major == 2 && $git_version_minor >= 12) # Output directory path that testscripts must use to prepare repositories # required by tests they contains. -- cgit v1.1