diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-05-06 22:59:51 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-05-06 22:59:51 +0300 |
| commit | afe9cf931a7cbf972c445189073a9da1ad6130e6 (patch) | |
| tree | 65ac5a8ccab853ad06a7e31758b154e72f7f411e | |
| parent | 3a72938103d0e5577aa817e047a5b1d9427421b5 (diff) | |
Allow stubs in bdep-release tag mode
| -rw-r--r-- | bdep/release.cxx | 4 | ||||
| -rw-r--r-- | tests/release.testscript | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bdep/release.cxx b/bdep/release.cxx index 71c6372..00c8dca 100644 --- a/bdep/release.cxx +++ b/bdep/release.cxx @@ -680,11 +680,11 @@ namespace bdep standard_version v; try { - // Allow stubs only in the --revision mode. + // Allow stubs only in the --revision and --tag modes. // standard_version::flags f (standard_version::none); - if (o.revision ()) + if (o.revision () || o.tag ()) f |= standard_version::allow_stub; v = standard_version (vv.value, f); diff --git a/tests/release.testscript b/tests/release.testscript index 1ba4cbc..fc10ff7 100644 --- a/tests/release.testscript +++ b/tests/release.testscript @@ -1140,5 +1140,4 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $* --squash 1 2>'error: --squash requires --amend' != 0; $* --revision --amend --squash 0 2>'error: invalid --squash value: 0' != 0; $* --revision --amend --no-commit 2>'error: both --amend and --no-commit specified' != 0 - } |