From 18401fdb032beb2bd7020eb81113cf7ba02a339b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 7 Jul 2021 10:03:35 +0200 Subject: Tweak test to work with newer git versions --- tests/publish.testscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/publish.testscript') 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 -- cgit v1.1