tests: update to new git output

The tests were failing on some minor output changes. It looks like this is
output change on the git side. We match the two variants in the tests.
This commit is contained in:
Pierre-Yves David 2017-11-24 21:04:54 +01:00
parent 9134dabfc4
commit 9778c082da

View File

@ -84,12 +84,13 @@ bail if the user does not have dulwich
$ cd gitrepo2
$ git checkout branch1 2>&1 | grep -v 'up-to-date'
Already on 'branch1'
Your branch is up to date with 'origin/branch1'. (?)
$ echo g1 >> f1
$ git add f1
$ commit -m "append f1"
$ git checkout branch2
Switched to a new branch 'branch2'
Branch branch2 set up to track remote branch branch2 from origin.
Branch '?branch2'? set up to track remote branch '?branch2'? from '?origin'?. (re)
$ echo g2 >> f2
$ git add f2
$ commit -m "append f2"