Skip to content
Snippets Groups Projects
Commit 51b3b3b4927e authored by durin42's avatar durin42
Browse files

tests: add some extra filters for new output

Tests pass on both my Mac and Linux machine, so I feel moderately confident
that this is portable.
parent 623cb724c3d0
No related branches found
No related tags found
No related merge requests found
......@@ -82,7 +82,7 @@
Cloning into 'gitrepo2'...
done.
$ cd gitrepo2
$ git checkout branch1
$ git checkout branch1 2>&1 | grep -v 'up-to-date'
Already on 'branch1'
$ echo g1 >> f1
$ git add f1
......
......@@ -27,6 +27,6 @@
while older git will use the full normalized path for .)
$ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../'
$ git clone ../gitrepo1 . | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
$ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
......@@ -31,6 +31,6 @@
Initialized empty Git repository in ...
$ git submodule add ../gitsubrepo subrepo | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
$ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
$ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//'
......@@ -48,7 +48,7 @@
[master a000567] change subrepo commit
1 file changed, 1 insertion(+), 1 deletion(-)
$ git submodule add ../gitsubrepo subrepo2 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
$ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
$ git commit -m 'add another subrepo' | sed 's/, 0 deletions(-)//'
......@@ -79,7 +79,7 @@
$ git rm alpha
rm 'alpha'
$ git submodule add ../gitsubrepo alpha | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
$ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
$ git commit -m 'replace file with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//'
......
......@@ -28,7 +28,7 @@
$ git config receive.denyCurrentBranch ignore
$ cd ..
Ensure gitlinks are transformed to .hgsubstate on hg pull from git
$ hg clone gitrepo1 hgrepo
$ hg clone gitrepo1 hgrepo 2>&1 | egrep -v '^(Cloning into|done)'
importing git objects into hg
updating to branch default
cloning subrepo subrepo1 from $TESTTMP/gitsubrepo
......
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