Skip to content
Snippets Groups Projects
Commit 8dd307fd authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

tests: adapt to alpine differences

parent d40e53a2
No related branches found
No related tags found
1 merge request!56GitLab CI
......@@ -85,9 +85,7 @@
Cloning into 'gitrepo2'...
done.
$ cd gitrepo2
$ git checkout branch1 2>&1 | grep -v 'up-to-date'
Already on 'branch1'
Your branch is up to date with 'origin/branch1'. (?)
$ git checkout -q branch1
$ echo g1 >> f1
$ git add f1
$ commit -m "append f1"
......@@ -91,9 +89,7 @@
$ 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'?. (re)
$ git checkout -q branch2
$ echo g2 >> f2
$ git add f2
$ commit -m "append f2"
......
......@@ -23,7 +23,7 @@
[255]
#else
$ hg serve -p $HGPORT1 2>&1
abort: cannot start server at '*:$HGPORT1': Address already in use (glob)
abort: cannot start server at '*:$HGPORT1': Address* in use (glob)
[255]
#endif
$ cd ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment