tests: cope with yet another git output format change

Augie Fackler committed 14 years ago

Commit 019ac111 parent 2c440e84 files · +4 −4Browse files

Unified · Split

4 files

tests/test-merge +1 −1
tests/test-merge.out +1 −1
tests/test-octopus +1 −1
tests/test-octopus.out +1 −1

tests/test-merge+1−1

@@ -48,7 +48,7 @@ git add gamma · 47 unmodified lines
48	48	commit -m 'add gamma'
49	49
50	50	# clean merge
51		−git merge beta \| sed "s/the '//;s/' strategy//" \| sed 's/^Merge.recursive.$/Merge successful/' \| sed 's/files/file/;s/insertions/insertion/'
	51	+git merge beta \| sed "s/the '//;s/' strategy//" \| sed 's/^Merge.recursive.$/Merge successful/' \| sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//'
52	52
53	53	cd ..
54	54	mkdir gitrepo2

tests/test-merge.out+1−1

@@ -4,7 +4,7 @@ Switched to a new branch "beta" · 3 unmodified lines
4	4	Switched to branch "master"
5	5	Merge successful
6	6	beta \| 1 +
7		− 1 file changed, 1 insertion(+), 0 deletions(-)
	7	+ 1 file changed, 1 insertion(+)
8	8	create mode 100644 beta
9	9	Initialized empty Git repository in gitrepo2/
10	10

tests/test-octopus+1−1

@@ -53,7 +53,7 @@ echo delta > delta · 52 unmodified lines
53	53	git add delta
54	54	commit -m 'add delta'
55	55
56		−git merge branch1 branch2 \| sed "s/the '//;s/' strategy//" \| sed 's/^Merge.octopus.$/Merge successful/'
	56	+git merge branch1 branch2 \| sed "s/the '//;s/' strategy//" \| sed 's/^Merge.octopus.$/Merge successful/;s/, 0 deletions.*//'
57	57
58	58	cd ..
59	59	mkdir gitrepo2

tests/test-octopus.out+1−1

@@ -8,7 +8,7 @@ Trying simple merge with branch2 · 7 unmodified lines
8	8	Merge successful
9	9	beta \| 1 +
10	10	gamma \| 1 +
11		− 2 files changed, 2 insertions(+), 0 deletions(-)
	11	+ 2 files changed, 2 insertions(+)
12	12	create mode 100644 beta
13	13	create mode 100644 gamma
14	14	Initialized empty Git repository in gitrepo2/