diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-23 17:39:00 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-23 17:39:10 +0300 |
| commit | 0ee1e194504cc267b372e0c9316e29a9db7273d0 (patch) | |
| tree | 8638c7f69d0ee91af75121eabc4baa4fbd892083 | |
| parent | f85470374ca03371d95f84eed1f9ef863eb87dcd (diff) | |
| download | bdep-0ee1e194504cc267b372e0c9316e29a9db7273d0.tar.gz bdep-0ee1e194504cc267b372e0c9316e29a9db7273d0.tar.xz bdep-0ee1e194504cc267b372e0c9316e29a9db7273d0.zip | |
Fix bdep-release tests failing for git 2.20.0 and above
Starting 2.20.0 git-pull requires --force option to update local tag.
| -rw-r--r-- | tests/release.testscript | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/release.testscript b/tests/release.testscript index ba0c08b..a06bfab 100644 --- a/tests/release.testscript +++ b/tests/release.testscript @@ -586,7 +586,12 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $release --tag --push --yes -d prj; - $pull2 --tags; # Updates the existing local tag. + # Updates the existing local tag. + # + # Note that starting git 2.20.0 --force is also required (see git + # release notes for details). + # + $pull2 --tags --force; $log2 >>:~%EOO% % \(HEAD -> master, tag: v0.1.0, \.*\) Release version 0.1.0\+1%d Release version 0.1.0 @@ -925,7 +930,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $gp push origin master; - $pull2 --tags; # Updates the existing local tag. + $pull2 --tags --force; # Updates the existing local tag (see above). $log2 >>:~%EOO%; % \(HEAD -> master, \.*\) Release version 0.2.0%d Change version to 0.2.0-a.0.z @@ -939,7 +944,7 @@ log2 = $gp2 log '--pretty=format:"%d %s"' $gp push origin refs/tags/v0.2.0; - $pull2 --tags; # Updates the existing local tag. + $pull2 --tags --force; # Updates the existing local tag (see above). $log2 >>:~%EOO% % \(HEAD -> master, tag: v0.2.0, \.*\) Release version 0.2.0%d Change version to 0.2.0-a.0.z |