diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-08-15 14:42:24 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-08-15 14:42:24 +0200 |
| commit | b1aafd32c2e8eaa636eb13398219f225f480e788 (patch) | |
| tree | 699076452e5b12ef51b039488d1f15db725ce45e | |
| parent | 8e5f53fd249f08b0be0a7d4eec65f425cfb79eae (diff) | |
Always use full (three-component) git version for consistency
| -rw-r--r-- | bdep/publish.cxx | 4 | ||||
| -rw-r--r-- | tests/common.test | 4 | ||||
| -rw-r--r-- | tests/publish.test | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bdep/publish.cxx b/bdep/publish.cxx index c498361..07e2396 100644 --- a/bdep/publish.cxx +++ b/bdep/publish.cxx @@ -26,9 +26,9 @@ using namespace butl; namespace bdep { - // The minimum supported git version must be at least 2.5 due to the git + // The minimum supported git version must be at least 2.5.0 due to the git // worktree command used. We also use bpkg that caps the git version at - // 2.12, so let's use is as the lowest common denominator. + // 2.12.0, so let's use is as the lowest common denominator. // static const semantic_version git_ver {2, 12, 0}; diff --git a/tests/common.test b/tests/common.test index 80d37d3..46c4de9 100644 --- a/tests/common.test +++ b/tests/common.test @@ -16,7 +16,7 @@ build = $recall($build.path) test.options += --build $build # Check that git version is the minimum supported one or above. The lowest -# common denominator for bdep commands is 2.1. +# common denominator for bdep commands is 2.1.0. # +git --version | set git_version_out @@ -32,7 +32,7 @@ end +if! ($git_version_major > 2 || \ $git_version_major == 2 && $git_version_minor >= 1) - exit "minimum supported git version is 2.1" + exit "minimum supported git version is 2.1.0" end # Helper commands that can be used by tests to prepare the testing environment diff --git a/tests/publish.test b/tests/publish.test index d8d86d8..663066f 100644 --- a/tests/publish.test +++ b/tests/publish.test @@ -5,7 +5,7 @@ .include common.test project.test # bdep-publish requirements for the minimum supported git version are higher -# then the default 2.1 (see bdep/publish.cxx for details). +# then the default 2.1.0 (see bdep/publish.cxx for details). # +if! ($git_version_major > 2 || \ $git_version_major == 2 && $git_version_minor >= 12) |