[thirdparty/git.git] / t / t3206-range-diff.sh

#!/bin/sh

test_description='range-diff tests'

. ./test-lib.sh

# Note that because of the range-diff's heuristics, test_commit does more
# harm than good.  We need some real history.

test_expect_success 'setup' '
	git fast-import < "$TEST_DIRECTORY"/t3206/history.export
'

test_expect_success 'simple A..B A..C (unmodified)' '
	git range-diff --no-color master..topic master..unmodified \
		>actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  35b9b25 s/5/A/
	2:  fccce22 = 2:  de345ab s/4/A/
	3:  147e64e = 3:  9af6654 s/11/B/
	4:  a63e992 = 4:  2901f77 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'simple B...C (unmodified)' '
	git range-diff --no-color topic...unmodified >actual &&
	# same "expected" as above
	test_cmp expected actual
'

test_expect_success 'simple A B C (unmodified)' '
	git range-diff --no-color master topic unmodified >actual &&
	# same "expected" as above
	test_cmp expected actual
'

test_expect_success 'trivial reordering' '
	git range-diff --no-color master topic reordered >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  aca177a s/5/A/
	3:  147e64e = 2:  14ad629 s/11/B/
	4:  a63e992 = 3:  ee58208 s/12/B/
	2:  fccce22 = 4:  307b27a s/4/A/
	EOF
	test_cmp expected actual
'

test_expect_success 'removed a commit' '
	git range-diff --no-color master topic removed >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  7657159 s/5/A/
	2:  fccce22 < -:  ------- s/4/A/
	3:  147e64e = 2:  43d84d3 s/11/B/
	4:  a63e992 = 3:  a740396 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'added a commit' '
	git range-diff --no-color master topic added >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  2716022 s/5/A/
	2:  fccce22 = 2:  b62accd s/4/A/
	-:  ------- > 3:  df46cfa s/6/A/
	3:  147e64e = 4:  3e64548 s/11/B/
	4:  a63e992 = 5:  12b4063 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'new base, A B C' '
	git range-diff --no-color master topic rebased >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  cc9c443 s/5/A/
	2:  fccce22 = 2:  c5d9641 s/4/A/
	3:  147e64e = 3:  28cc2b6 s/11/B/
	4:  a63e992 = 4:  5628ab7 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'new base, B...C' '
	# this syntax includes the commits from master!
	git range-diff --no-color topic...rebased >actual &&
	cat >expected <<-EOF &&
	-:  ------- > 1:  a31b12e unrelated
	1:  4de457d = 2:  cc9c443 s/5/A/
	2:  fccce22 = 3:  c5d9641 s/4/A/
	3:  147e64e = 4:  28cc2b6 s/11/B/
	4:  a63e992 = 5:  5628ab7 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'changed commit' '
	git range-diff --no-color topic...changed >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  a4b3333 s/5/A/
	2:  fccce22 = 2:  f51d370 s/4/A/
	3:  147e64e ! 3:  0559556 s/11/B/
	    @@
	      9
	      10
	     -11
	    -+B
	    ++BB
	      12
	      13
	      14
	4:  a63e992 ! 4:  d966c5c s/12/B/
	    @@
	     @@ file: A
	      9
	      10
	    - B
	    + BB
	     -12
	     +B
	      13
	EOF
	test_cmp expected actual
'

test_expect_success 'changed commit with --no-patch diff option' '
	git range-diff --no-color --no-patch topic...changed >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  a4b3333 s/5/A/
	2:  fccce22 = 2:  f51d370 s/4/A/
	3:  147e64e ! 3:  0559556 s/11/B/
	4:  a63e992 ! 4:  d966c5c s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'changed commit with --stat diff option' '
	git range-diff --no-color --stat topic...changed >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  a4b3333 s/5/A/
	     a => b | 0
	     1 file changed, 0 insertions(+), 0 deletions(-)
	2:  fccce22 = 2:  f51d370 s/4/A/
	     a => b | 0
	     1 file changed, 0 insertions(+), 0 deletions(-)
	3:  147e64e ! 3:  0559556 s/11/B/
	     a => b | 0
	     1 file changed, 0 insertions(+), 0 deletions(-)
	4:  a63e992 ! 4:  d966c5c s/12/B/
	     a => b | 0
	     1 file changed, 0 insertions(+), 0 deletions(-)
	EOF
	test_cmp expected actual
'

test_expect_success 'changed commit with sm config' '
	git range-diff --no-color --submodule=log topic...changed >actual &&
	cat >expected <<-EOF &&
	1:  4de457d = 1:  a4b3333 s/5/A/
	2:  fccce22 = 2:  f51d370 s/4/A/
	3:  147e64e ! 3:  0559556 s/11/B/
	    @@
	      9
	      10
	     -11
	    -+B
	    ++BB
	      12
	      13
	      14
	4:  a63e992 ! 4:  d966c5c s/12/B/
	    @@
	     @@ file: A
	      9
	      10
	    - B
	    + BB
	     -12
	     +B
	      13
	EOF
	test_cmp expected actual
'

test_expect_success 'renamed file' '
	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
	sed s/Z/\ /g >expected <<-EOF &&
	1:  4de457d = 1:  f258d75 s/5/A/
	2:  fccce22 ! 2:  017b62d s/4/A/
	    @@
	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	    Z
	    -    s/4/A/
	    +    s/4/A/ + rename file
	    Z
	    - ## file ##
	    + ## file => renamed-file ##
	    Z@@
	    Z 1
	    Z 2
	3:  147e64e ! 3:  3ce7af6 s/11/B/
	    @@
	    Z
	    Z    s/11/B/
	    Z
	    - ## file ##
	    -@@ file: A
	    + ## renamed-file ##
	    +@@ renamed-file: A
	    Z 8
	    Z 9
	    Z 10
	4:  a63e992 ! 4:  1e6226b s/12/B/
	    @@
	    Z
	    Z    s/12/B/
	    Z
	    - ## file ##
	    -@@ file: A
	    + ## renamed-file ##
	    +@@ renamed-file: A
	    Z 9
	    Z 10
	    Z B
	EOF
	test_cmp expected actual
'

test_expect_success 'file added and later removed' '
	git range-diff --no-color --submodule=log topic...added-removed >actual &&
	sed s/Z/\ /g >expected <<-EOF &&
	1:  4de457d = 1:  096b1ba s/5/A/
	2:  fccce22 ! 2:  d92e698 s/4/A/
	    @@
	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	    Z
	    -    s/4/A/
	    +    s/4/A/ + new-file
	    Z
	    Z ## file ##
	    Z@@
	    @@
	    Z A
	    Z 6
	    Z 7
	    +
	    + ## new-file (new) ##
	3:  147e64e ! 3:  9a1db4d s/11/B/
	    @@
	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	    Z
	    -    s/11/B/
	    +    s/11/B/ + remove file
	    Z
	    Z ## file ##
	    Z@@ file: A
	    @@
	    Z 12
	    Z 13
	    Z 14
	    +
	    + ## new-file (deleted) ##
	4:  a63e992 = 4:  fea3b5c s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'no commits on one side' '
	git commit --amend -m "new message" &&
	git range-diff master HEAD@{1} HEAD
'

test_expect_success 'changed message' '
	git range-diff --no-color topic...changed-message >actual &&
	sed s/Z/\ /g >expected <<-EOF &&
	1:  4de457d = 1:  f686024 s/5/A/
	2:  fccce22 ! 2:  4ab067d s/4/A/
	    @@
	    Z
	    Z    s/4/A/
	    Z
	    +    Also a silly comment here!
	    +
	    Z ## file ##
	    Z@@
	    Z 1
	3:  147e64e = 3:  b9cb956 s/11/B/
	4:  a63e992 = 4:  8add5f1 s/12/B/
	EOF
	test_cmp expected actual
'

test_expect_success 'dual-coloring' '
	sed -e "s|^:||" >expect <<-\EOF &&
	:<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
	:<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
	:    <REVERSE><CYAN>@@<RESET>
	:     <RESET>
	:         s/4/A/<RESET>
	:     <RESET>
	:    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
	:    <REVERSE><GREEN>+<RESET>
	:      ## file ##<RESET>
	:    <CYAN> @@<RESET>
	:      1<RESET>
	:<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
	:    <REVERSE><CYAN>@@<RESET>
	:      9<RESET>
	:      10<RESET>
	:    <RED> -11<RESET>
	:    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
	:    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
	:      12<RESET>
	:      13<RESET>
	:      14<RESET>
	:<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
	:    <REVERSE><CYAN>@@<RESET>
	:    <CYAN> @@ file: A<RESET>
	:      9<RESET>
	:      10<RESET>
	:    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
	:    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
	:    <RED> -12<RESET>
	:    <GREEN> +B<RESET>
	:      13<RESET>
	EOF
	git range-diff changed...changed-message --color --dual-color >actual.raw &&
	test_decode_color >actual <actual.raw &&
	test_cmp expect actual
'

for prev in topic master..topic
do
	test_expect_success "format-patch --range-diff=$prev" '
		git format-patch --cover-letter --range-diff=$prev \
			master..unmodified >actual &&
		test_when_finished "rm 000?-*" &&
		test_line_count = 5 actual &&
		test_i18ngrep "^Range-diff:$" 0000-* &&
		grep "= 1: .* s/5/A" 0000-* &&
		grep "= 2: .* s/4/A" 0000-* &&
		grep "= 3: .* s/11/B" 0000-* &&
		grep "= 4: .* s/12/B" 0000-*
	'
done

test_expect_success 'format-patch --range-diff as commentary' '
	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
	test_when_finished "rm 0001-*" &&
	test_line_count = 1 actual &&
	test_i18ngrep "^Range-diff:$" 0001-* &&
	grep "> 1: .* new message" 0001-*
'

test_done
Commit	Line	Data
8884cf15 TR	1	#!/bin/sh
	2
	3	test_description='range-diff tests'
	4
	5	. ./test-lib.sh
	6
	7	# Note that because of the range-diff's heuristics, test_commit does more
	8	# harm than good. We need some real history.
	9
	10	test_expect_success 'setup' '
	11	git fast-import < "$TEST_DIRECTORY"/t3206/history.export
	12	'
	13
	14	test_expect_success 'simple A..B A..C (unmodified)' '
	15	git range-diff --no-color master..topic master..unmodified \
	16	>actual &&
	17	cat >expected <<-EOF &&
	18	1: 4de457d = 1: 35b9b25 s/5/A/
	19	2: fccce22 = 2: de345ab s/4/A/
	20	3: 147e64e = 3: 9af6654 s/11/B/
	21	4: a63e992 = 4: 2901f77 s/12/B/
	22	EOF
	23	test_cmp expected actual
	24	'
	25
	26	test_expect_success 'simple B...C (unmodified)' '
	27	git range-diff --no-color topic...unmodified >actual &&
	28	# same "expected" as above
	29	test_cmp expected actual
	30	'
	31
	32	test_expect_success 'simple A B C (unmodified)' '
	33	git range-diff --no-color master topic unmodified >actual &&
	34	# same "expected" as above
	35	test_cmp expected actual
	36	'
	37
	38	test_expect_success 'trivial reordering' '
	39	git range-diff --no-color master topic reordered >actual &&
	40	cat >expected <<-EOF &&
	41	1: 4de457d = 1: aca177a s/5/A/
	42	3: 147e64e = 2: 14ad629 s/11/B/
	43	4: a63e992 = 3: ee58208 s/12/B/
	44	2: fccce22 = 4: 307b27a s/4/A/
	45	EOF
	46	test_cmp expected actual
	47	'
	48
	49	test_expect_success 'removed a commit' '
	50	git range-diff --no-color master topic removed >actual &&
	51	cat >expected <<-EOF &&
	52	1: 4de457d = 1: 7657159 s/5/A/
	53	2: fccce22 < -: ------- s/4/A/
	54	3: 147e64e = 2: 43d84d3 s/11/B/
	55	4: a63e992 = 3: a740396 s/12/B/
	56	EOF
	57	test_cmp expected actual
	58	'
	59
	60	test_expect_success 'added a commit' '
	61	git range-diff --no-color master topic added >actual &&
	62	cat >expected <<-EOF &&
	63	1: 4de457d = 1: 2716022 s/5/A/
	64	2: fccce22 = 2: b62accd s/4/A/
65	-: ------- > 3: df46cfa s/6/A/
66	3: 147e64e = 4: 3e64548 s/11/B/
67	4: a63e992 = 5: 12b4063 s/12/B/
68	EOF
69	test_cmp expected actual
70	'
71
72	test_expect_success 'new base, A B C' '
73	git range-diff --no-color master topic rebased >actual &&
74	cat >expected <<-EOF &&
75	1: 4de457d = 1: cc9c443 s/5/A/
76	2: fccce22 = 2: c5d9641 s/4/A/
77	3: 147e64e = 3: 28cc2b6 s/11/B/
78	4: a63e992 = 4: 5628ab7 s/12/B/
79	EOF
80	test_cmp expected actual
81	'
82
83	test_expect_success 'new base, B...C' '
84	# this syntax includes the commits from master!
85	git range-diff --no-color topic...rebased >actual &&
86	cat >expected <<-EOF &&
87	-: ------- > 1: a31b12e unrelated
88	1: 4de457d = 2: cc9c443 s/5/A/
89	2: fccce22 = 3: c5d9641 s/4/A/
90	3: 147e64e = 4: 28cc2b6 s/11/B/
91	4: a63e992 = 5: 5628ab7 s/12/B/
92	EOF
93	test_cmp expected actual
94	'
95
96	test_expect_success 'changed commit' '
97	git range-diff --no-color topic...changed >actual &&
98	cat >expected <<-EOF &&
99	1: 4de457d = 1: a4b3333 s/5/A/
100	2: fccce22 = 2: f51d370 s/4/A/
101	3: 147e64e ! 3: 0559556 s/11/B/
430be36e	102	@@
8884cf15 TR	103	9
	104	10
	105	-11
	106	-+B
	107	++BB
	108	12
	109	13
	110	14
	111	4: a63e992 ! 4: d966c5c s/12/B/
430be36e	112	@@
444e0969	113	@@ file: A
8884cf15 TR	114	9
	115	10
	116	- B
	117	+ BB
	118	-12
	119	+B
	120	13
	121	EOF
	122	test_cmp expected actual
	123	'
	124
4624185a ÆAB	125	test_expect_success 'changed commit with --no-patch diff option' '
	126	git range-diff --no-color --no-patch topic...changed >actual &&
	127	cat >expected <<-EOF &&
	128	1: 4de457d = 1: a4b3333 s/5/A/
	129	2: fccce22 = 2: f51d370 s/4/A/
	130	3: 147e64e ! 3: 0559556 s/11/B/
	131	4: a63e992 ! 4: d966c5c s/12/B/
	132	EOF
	133	test_cmp expected actual
	134	'
	135
	136	test_expect_success 'changed commit with --stat diff option' '
4624185a ÆAB	137	git range-diff --no-color --stat topic...changed >actual &&
	138	cat >expected <<-EOF &&
	139	1: 4de457d = 1: a4b3333 s/5/A/
	140	a => b \| 0
	141	1 file changed, 0 insertions(+), 0 deletions(-)
4624185a ÆAB	142	2: fccce22 = 2: f51d370 s/4/A/
	143	a => b \| 0
	144	1 file changed, 0 insertions(+), 0 deletions(-)
4624185a ÆAB	145	3: 147e64e ! 3: 0559556 s/11/B/
	146	a => b \| 0
	147	1 file changed, 0 insertions(+), 0 deletions(-)
4624185a ÆAB	148	4: a63e992 ! 4: d966c5c s/12/B/
	149	a => b \| 0
	150	1 file changed, 0 insertions(+), 0 deletions(-)
4624185a ÆAB	151	EOF
	152	test_cmp expected actual
	153	'
	154
0e573e8f LDM	155	test_expect_success 'changed commit with sm config' '
	156	git range-diff --no-color --submodule=log topic...changed >actual &&
	157	cat >expected <<-EOF &&
	158	1: 4de457d = 1: a4b3333 s/5/A/
	159	2: fccce22 = 2: f51d370 s/4/A/
	160	3: 147e64e ! 3: 0559556 s/11/B/
430be36e	161	@@
0e573e8f LDM	162	9
	163	10
	164	-11
	165	-+B
	166	++BB
	167	12
	168	13
	169	14
	170	4: a63e992 ! 4: d966c5c s/12/B/
430be36e	171	@@
444e0969	172	@@ file: A
0e573e8f LDM	173	9
	174	10
	175	- B
	176	+ BB
	177	-12
	178	+B
	179	13
	180	EOF
	181	test_cmp expected actual
	182	'
	183
b66885a3 TG	184	test_expect_success 'renamed file' '
	185	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
	186	sed s/Z/\ /g >expected <<-EOF &&
	187	1: 4de457d = 1: f258d75 s/5/A/
	188	2: fccce22 ! 2: 017b62d s/4/A/
	189	@@
	190	ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	191	Z
	192	- s/4/A/
	193	+ s/4/A/ + rename file
	194	Z
	195	- ## file ##
	196	+ ## file => renamed-file ##
	197	Z@@
	198	Z 1
	199	Z 2
	200	3: 147e64e ! 3: 3ce7af6 s/11/B/
	201	@@
	202	Z
	203	Z s/11/B/
	204	Z
	205	- ## file ##
444e0969	206	-@@ file: A
b66885a3	207	+ ## renamed-file ##
444e0969	208	+@@ renamed-file: A
b66885a3 TG	209	Z 8
b66885a3 TG	210	Z 9
444e0969	211	Z 10
b66885a3 TG	212	4: a63e992 ! 4: 1e6226b s/12/B/
	213	@@
	214	Z
	215	Z s/12/B/
	216	Z
	217	- ## file ##
444e0969	218	-@@ file: A
b66885a3	219	+ ## renamed-file ##
444e0969	220	+@@ renamed-file: A
b66885a3 TG	221	Z 9
b66885a3 TG	222	Z 10
444e0969	223	Z B
b66885a3 TG	224	EOF
	225	test_cmp expected actual
	226	'
	227
	228	test_expect_success 'file added and later removed' '
	229	git range-diff --no-color --submodule=log topic...added-removed >actual &&
	230	sed s/Z/\ /g >expected <<-EOF &&
	231	1: 4de457d = 1: 096b1ba s/5/A/
	232	2: fccce22 ! 2: d92e698 s/4/A/
	233	@@
	234	ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	235	Z
	236	- s/4/A/
	237	+ s/4/A/ + new-file
	238	Z
	239	Z ## file ##
	240	Z@@
	241	@@
	242	Z A
	243	Z 6
	244	Z 7
	245	+
	246	+ ## new-file (new) ##
	247	3: 147e64e ! 3: 9a1db4d s/11/B/
	248	@@
	249	ZAuthor: Thomas Rast <trast@inf.ethz.ch>
	250	Z
	251	- s/11/B/
	252	+ s/11/B/ + remove file
	253	Z
	254	Z ## file ##
444e0969	255	Z@@ file: A
b66885a3 TG	256	@@
	257	Z 12
	258	Z 13
	259	Z 14
	260	+
	261	+ ## new-file (deleted) ##
	262	4: a63e992 = 4: fea3b5c s/12/B/
	263	EOF
	264	test_cmp expected actual
	265	'
	266
51bbcda1 JH	267	test_expect_success 'no commits on one side' '
	268	git commit --amend -m "new message" &&
	269	git range-diff master HEAD@{1} HEAD
	270	'
	271
8884cf15 TR	272	test_expect_success 'changed message' '
	273	git range-diff --no-color topic...changed-message >actual &&
	274	sed s/Z/\ /g >expected <<-EOF &&
	275	1: 4de457d = 1: f686024 s/5/A/
	276	2: fccce22 ! 2: 4ab067d s/4/A/
430be36e	277	@@
8884cf15 TR	278	Z
	279	Z s/4/A/
	280	Z
	281	+ Also a silly comment here!
	282	+
b66885a3 TG	283	Z ## file ##
	284	Z@@
	285	Z 1
8884cf15 TR	286	3: 147e64e = 3: b9cb956 s/11/B/
	287	4: a63e992 = 4: 8add5f1 s/12/B/
	288	EOF
	289	test_cmp expected actual
	290	'
	291
c5e64caa SB	292	test_expect_success 'dual-coloring' '
	293	sed -e "s\|^:\|\|" >expect <<-\EOF &&
	294	:<YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET>
	295	:<RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET>
430be36e	296	: <REVERSE><CYAN>@@<RESET>
c5e64caa SB	297	: <RESET>
	298	: s/4/A/<RESET>
	299	: <RESET>
	300	: <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>
29ef759d	301	: <REVERSE><GREEN>+<RESET>
b66885a3 TG	302	: ## file ##<RESET>
	303	: <CYAN> @@<RESET>
	304	: 1<RESET>
c5e64caa	305	:<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET>
430be36e	306	: <REVERSE><CYAN>@@<RESET>
c5e64caa SB	307	: 9<RESET>
	308	: 10<RESET>
	309	: <RED> -11<RESET>
	310	: <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
	311	: <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
	312	: 12<RESET>
	313	: 13<RESET>
	314	: 14<RESET>
	315	:<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET>
430be36e	316	: <REVERSE><CYAN>@@<RESET>
444e0969	317	: <CYAN> @@ file: A<RESET>
c5e64caa SB	318	: 9<RESET>
	319	: 10<RESET>
	320	: <REVERSE><RED>-<RESET><FAINT> BB<RESET>
	321	: <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
	322	: <RED> -12<RESET>
	323	: <GREEN> +B<RESET>
	324	: 13<RESET>
	325	EOF
	326	git range-diff changed...changed-message --color --dual-color >actual.raw &&
	327	test_decode_color >actual <actual.raw &&
	328	test_cmp expect actual
	329	'
	330
2e6fd71a	331	for prev in topic master..topic
31e2617a ES	332	do
31e2617a ES	333	test_expect_success "format-patch --range-diff=$prev" '
ac0edf1f	334	git format-patch --cover-letter --range-diff=$prev \
31e2617a	335	master..unmodified >actual &&
ac0edf1f MÅ	336	test_when_finished "rm 000?-*" &&
	337	test_line_count = 5 actual &&
	338	test_i18ngrep "^Range-diff:$" 0000-* &&
	339	grep "= 1: .* s/5/A" 0000-* &&
	340	grep "= 2: .* s/4/A" 0000-* &&
	341	grep "= 3: .* s/11/B" 0000-* &&
	342	grep "= 4: .* s/12/B" 0000-*
31e2617a ES	343	'
	344	done
	345
cdc067c3	346	test_expect_success 'format-patch --range-diff as commentary' '
ac0edf1f MÅ	347	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
	348	test_when_finished "rm 0001-*" &&
	349	test_line_count = 1 actual &&
	350	test_i18ngrep "^Range-diff:$" 0001-* &&
	351	grep "> 1: .* new message" 0001-*
cdc067c3 DS	352	'
cdc067c3 DS	353
8884cf15	354	test_done