Skip to content
Snippets Groups Projects
Commit a67f5baf authored by Tay Ray Chuan's avatar Tay Ray Chuan
Browse files

tests: accomodate changes in git-merge output

Since git v1.7.7, merge outputs its status in the form

  Merge made by the * strategy.

Use a regex substitution, so that older versions are handled
successfully as well.

Signed-off-by: default avatarTay Ray Chuan <rctay89@gmail.com>
parent 4bb2a81c
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
git merge beta | sed 's/^Merge.*recursive.*$/Merge successful/'
cd ..
mkdir gitrepo2
......
......@@ -2,7 +2,7 @@
Switched to a new branch "beta"
Switched to branch "master"
Merge made by recursive.
Merge successful
beta | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 beta
......
......@@ -53,7 +53,7 @@
git add delta
commit -m 'add delta'
git merge branch1 branch2
git merge branch1 branch2 | sed 's/^Merge.*octopus.*$/Merge successful/'
cd ..
mkdir gitrepo2
......
......@@ -5,7 +5,7 @@
Switched to branch "master"
Trying simple merge with branch1
Trying simple merge with branch2
Merge made by octopus.
Merge successful
beta | 1 +
gamma | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
......
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