[thirdparty/git.git] / t / t4037-diff-r-t-dirs.sh

#!/bin/sh

test_description='diff -r -t shows directory additions and deletions'

. ./test-lib.sh

test_expect_success setup '
	mkdir dc dr dt &&
	>dc/1 &&
	>dr/2 &&
	>dt/3 &&
	>fc &&
	>fr &&
	>ft &&
	git add . &&
	test_tick &&
	git commit -m initial &&

	rm -fr dt dr ft fr &&
	mkdir da ft &&
	for p in dc/1 da/4 dt ft/5 fc
	do
		echo hello >$p || exit
	done &&
	git add -u &&
	git add . &&
	test_tick &&
	git commit -m second
'

cat >expect <<\EOF
A	da
A	da/4
M	dc
M	dc/1
D	dr
D	dr/2
A	dt
D	dt
D	dt/3
M	fc
D	fr
D	ft
A	ft
A	ft/5
EOF

test_expect_success verify '
	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
	test_cmp expect actual
'

test_done
Commit	Line	Data
df533f34 NE	1	#!/bin/sh
	2
	3	test_description='diff -r -t shows directory additions and deletions'
	4
	5	. ./test-lib.sh
	6
	7	test_expect_success setup '
	8	mkdir dc dr dt &&
	9	>dc/1 &&
	10	>dr/2 &&
	11	>dt/3 &&
	12	>fc &&
	13	>fr &&
	14	>ft &&
	15	git add . &&
	16	test_tick &&
	17	git commit -m initial &&
	18
	19	rm -fr dt dr ft fr &&
	20	mkdir da ft &&
	21	for p in dc/1 da/4 dt ft/5 fc
	22	do
	23	echo hello >$p \|\| exit
	24	done &&
	25	git add -u &&
	26	git add . &&
	27	test_tick &&
	28	git commit -m second
	29	'
	30
	31	cat >expect <<\EOF
	32	A da
	33	A da/4
	34	M dc
	35	M dc/1
	36	D dr
	37	D dr/2
	38	A dt
	39	D dt
	40	D dt/3
	41	M fc
	42	D fr
	43	D ft
	44	A ft
	45	A ft/5
	46	EOF
	47
	48	test_expect_success verify '
	49	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
	50	test_cmp expect actual
	51	'
	52
	53	test_done