aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-08-04 18:11:38 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-08-04 18:11:38 +0300
commit1b33338c861231d9ab66f2dfca4de27f7a53f5ba (patch)
tree045c202e1cc11c72e26e902202dd74f9099a737f
parent91d2681710b33aada66c6bd335eb7c273ced8787 (diff)
Fix unreliable git output match in publish testscript
-rw-r--r--bdep/publish.cxx2
-rw-r--r--tests/publish.test2
2 files changed, 1 insertions, 3 deletions
diff --git a/bdep/publish.cxx b/bdep/publish.cxx
index c27609a..399b04e 100644
--- a/bdep/publish.cxx
+++ b/bdep/publish.cxx
@@ -1076,7 +1076,7 @@ namespace bdep
// Note that until this is done the branch can not be checked out in any
// other worktree.
//
- auto worktree_remove = [&prj, &wd, &wd_rm, &worktree_prune] ()
+ auto worktree_remove = [&wd, &wd_rm, &worktree_prune] ()
{
if (exists (wd))
{
diff --git a/tests/publish.test b/tests/publish.test
index a5dc545..e17ae75 100644
--- a/tests/publish.test
+++ b/tests/publish.test
@@ -270,7 +270,6 @@ windows = ($cxx.target.class == 'windows')
upgrade prj/1.0.8
pushing build2-control
%.*
- Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'.
submitting prj-1.0.8.tar.gz
%.*
%prj/1\.0\.8 submission is queued \(.{12}\)%
@@ -396,7 +395,6 @@ windows = ($cxx.target.class == 'windows')
upgrade prj/1.0.13
pushing build2-control
%.*
- Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'.
submitting prj-1.0.13.tar.gz
%.*
%prj/1\.0\.13 submission is queued \(.{12}\)%