diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t index bfe05fd75b187dd0bd407e564e68839cd4c0a9a5_dGVzdHMvdGVzdC1zdWJyZXBvcy50..74fea2f30ac8e23886f1ac8f85329f939a24b36d_dGVzdHMvdGVzdC1zdWJyZXBvcy50 100644 --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -58,7 +58,7 @@ $ cd .. $ cd hgrepo $ 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 56f0304..aabf7cd master -> origin/master Updating 56f0304..aabf7cd