Skip to content
Snippets Groups Projects
Commit 74fea2f30ac8 authored by Tristan Seligmann's avatar Tristan Seligmann
Browse files

tests: silence git pull warning

Pass --ff-only to git pull to avoid a warning.
parent bfe05fd75b18
No related branches found
No related tags found
1 merge request!41Silence git pull warning by passing --ff-only
Pipeline #12984 passed with warnings
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
$ cd .. $ cd ..
$ cd hgrepo $ cd hgrepo
$ cd xyz/subrepo2 $ cd xyz/subrepo2
$ git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /'
From $TESTTMP/gitsubrepo From $TESTTMP/gitsubrepo
56f0304..aabf7cd master -> origin/master 56f0304..aabf7cd master -> origin/master
Updating 56f0304..aabf7cd Updating 56f0304..aabf7cd
......
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