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

tests: cope with yet another git output format change

parent 4ed0d8da
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@
commit -m 'add gamma'
# clean merge
git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/'
git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//'
cd ..
mkdir gitrepo2
......
......@@ -4,7 +4,7 @@
Switched to branch "master"
Merge successful
beta | 1 +
1 file changed, 1 insertion(+), 0 deletions(-)
1 file changed, 1 insertion(+)
create mode 100644 beta
Initialized empty Git repository in gitrepo2/
......
......@@ -53,7 +53,7 @@
git add delta
commit -m 'add delta'
git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/'
git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//'
cd ..
mkdir gitrepo2
......
......@@ -8,7 +8,7 @@
Merge successful
beta | 1 +
gamma | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
2 files changed, 2 insertions(+)
create mode 100644 beta
create mode 100644 gamma
Initialized empty Git repository in gitrepo2/
......
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