aboutsummaryrefslogtreecommitdiff
path: root/tests/publish.testscript
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-07-07 10:03:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-07-07 10:03:35 +0200
commit18401fdb032beb2bd7020eb81113cf7ba02a339b (patch)
tree3ba6e77692194a140a6efc07901f51d8ec007af6 /tests/publish.testscript
parent7b874dd2c9f22d4134f638520d4c9349c1eef179 (diff)
Tweak test to work with newer git versions
Diffstat (limited to 'tests/publish.testscript')
-rw-r--r--tests/publish.testscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/publish.testscript b/tests/publish.testscript
index afcde71..8f5ec85 100644
--- a/tests/publish.testscript
+++ b/tests/publish.testscript
@@ -528,12 +528,14 @@ g = git -C prj >! 2>!
# Reproduce the situation when the local build2-control branch exists but
# the remote-tracking one doesn't (see brep/publish.cxx for details).
#
+ # @@ git 2.32.0 seems to no longer print "Branch set up to track ...".
+ #
$g branch -Dr origin/build2-control;
$* >&2 2>>~%EOE%;
synchronizing:
upgrade prj/1.0.13
- %Branch '?build2-control'? set up to track remote branch '?build2-control'? from '?origin'?.%d
+ %Branch '?build2-control'? set up to track remote branch '?build2-control'? from '?origin'?.%d?
%package submission is queued(: \.*prj/1.0.13)?%d
%reference: .{12}%
EOE