[thirdparty/git.git] / t / t4027-diff-submodule.sh

#!/bin/sh

test_description='difference in submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh

test_expect_success setup '
	test_tick &&
	test_create_repo sub &&
	(
		cd sub &&
		echo hello >world &&
		git add world &&
		git commit -m submodule
	) &&

	test_tick &&
	echo frotz >nitfol &&
	git add nitfol sub &&
	git commit -m superproject &&

	(
		cd sub &&
		echo goodbye >world &&
		git add world &&
		git commit -m "submodule #2"
	) &&

	set x $(
		cd sub &&
		git rev-list HEAD
	) &&
	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
	subtip=$3 subprev=$2
'

test_expect_success 'git diff --raw HEAD' '
	git diff --raw --abbrev=40 HEAD >actual &&
	test_cmp expect actual
'

test_expect_success 'git diff-index --raw HEAD' '
	git diff-index --raw HEAD >actual.index &&
	test_cmp expect actual.index
'

test_expect_success 'git diff-files --raw' '
	git diff-files --raw >actual.files &&
	test_cmp expect actual.files
'

expect_from_to () {
	printf "%sSubproject commit %s\n+Subproject commit %s\n" \
		"-" "$1" "$2"
}

test_expect_success 'git diff HEAD' '
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	test_cmp expect.body actual.body
'

test_expect_success 'git diff HEAD with dirty submodule (work tree)' '
	echo >>sub/world &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev-dirty &&
	test_cmp expect.body actual.body
'

test_expect_success 'git diff HEAD with dirty submodule (index)' '
	(
		cd sub &&
		git reset --hard &&
		echo >>world &&
		git add world
	) &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev-dirty &&
	test_cmp expect.body actual.body
'

test_expect_success 'git diff HEAD with dirty submodule (untracked)' '
	(
		cd sub &&
		git reset --hard &&
		git clean -qfdx &&
		>cruft
	) &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev-dirty &&
	test_cmp expect.body actual.body
'

test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)' '
	git commit -m "x" sub &&
	echo >>sub/world &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body &&
	git diff --ignore-submodules HEAD >actual2 &&
	test_must_be_empty actual2 &&
	git diff --ignore-submodules=untracked HEAD >actual3 &&
	sed -e "1,/^@@/d" actual3 >actual3.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual3.body &&
	git diff --ignore-submodules=dirty HEAD >actual4 &&
	test_must_be_empty actual4
'

test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
	git config diff.ignoreSubmodules dirty &&
	git diff HEAD >actual &&
	test_must_be_empty actual &&
	git config --add -f .gitmodules submodule.subname.ignore none &&
	git config --add -f .gitmodules submodule.subname.path sub &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body &&
	git config -f .gitmodules submodule.subname.ignore all &&
	git config -f .gitmodules submodule.subname.path sub &&
	git diff HEAD >actual2 &&
	test_must_be_empty actual2 &&
	git config -f .gitmodules submodule.subname.ignore untracked &&
	git diff HEAD >actual3 &&
	sed -e "1,/^@@/d" actual3 >actual3.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual3.body &&
	git config -f .gitmodules submodule.subname.ignore dirty &&
	git diff HEAD >actual4 &&
	test_must_be_empty actual4 &&
	git config submodule.subname.ignore none &&
	git config submodule.subname.path sub &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body &&
	git config --remove-section submodule.subname &&
	git config --remove-section -f .gitmodules submodule.subname &&
	git config --unset diff.ignoreSubmodules &&
	rm .gitmodules
'

test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
	(
		cd sub &&
		git reset --hard &&
		echo >>world &&
		git add world
	) &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body
'

test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)' '
	(
		cd sub &&
		git reset --hard &&
		git clean -qfdx &&
		>cruft
	) &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body &&
	git diff --ignore-submodules=all HEAD >actual2 &&
	test_must_be_empty actual2 &&
	git diff --ignore-submodules=untracked HEAD >actual3 &&
	test_must_be_empty actual3 &&
	git diff --ignore-submodules=dirty HEAD >actual4 &&
	test_must_be_empty actual4
'

test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
	git config --add -f .gitmodules submodule.subname.ignore all &&
	git config --add -f .gitmodules submodule.subname.path sub &&
	git diff HEAD >actual2 &&
	test_must_be_empty actual2 &&
	git config -f .gitmodules submodule.subname.ignore untracked &&
	git diff HEAD >actual3 &&
	test_must_be_empty actual3 &&
	git config -f .gitmodules submodule.subname.ignore dirty &&
	git diff HEAD >actual4 &&
	test_must_be_empty actual4 &&
	git config submodule.subname.ignore none &&
	git config submodule.subname.path sub &&
	git diff HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subprev $subprev-dirty &&
	test_cmp expect.body actual.body &&
	git config --remove-section submodule.subname &&
	git config --remove-section -f .gitmodules submodule.subname &&
	rm .gitmodules
'

test_expect_success 'git diff between submodule commits' '
	git diff HEAD^..HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	test_cmp expect.body actual.body &&
	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	test_cmp expect.body actual.body &&
	git diff --ignore-submodules HEAD^..HEAD >actual &&
	test_must_be_empty actual
'

test_expect_success 'git diff between submodule commits [.gitmodules]' '
	git diff HEAD^..HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	test_cmp expect.body actual.body &&
	git config --add -f .gitmodules submodule.subname.ignore dirty &&
	git config --add -f .gitmodules submodule.subname.path sub &&
	git diff HEAD^..HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	test_cmp expect.body actual.body &&
	git config -f .gitmodules submodule.subname.ignore all &&
	git diff HEAD^..HEAD >actual &&
	test_must_be_empty actual &&
	git config submodule.subname.ignore dirty &&
	git config submodule.subname.path sub &&
	git diff  HEAD^..HEAD >actual &&
	sed -e "1,/^@@/d" actual >actual.body &&
	expect_from_to >expect.body $subtip $subprev &&
	git config --remove-section submodule.subname &&
	git config --remove-section -f .gitmodules submodule.subname &&
	rm .gitmodules
'

test_expect_success 'git diff (empty submodule dir)' '
	rm -rf sub/* sub/.git &&
	git diff > actual.empty &&
	test_must_be_empty actual.empty
'

test_expect_success 'conflicted submodule setup' '

	# 39 efs
	c=fffffffffffffffffffffffffffffffffffffff &&
	(
		echo "000000 $ZERO_OID 0	sub" &&
		echo "160000 1$c 1	sub" &&
		echo "160000 2$c 2	sub" &&
		echo "160000 3$c 3	sub"
	) | git update-index --index-info &&
	echo >expect.nosub '\''diff --cc sub
index 2ffffff,3ffffff..0000000
--- a/sub
+++ b/sub
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
 -Subproject commit 3fffffffffffffffffffffffffffffffffffffff
++Subproject commit 0000000000000000000000000000000000000000'\'' &&

	hh=$(git rev-parse HEAD) &&
	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub

'

test_expect_success 'combined (empty submodule)' '
	rm -fr sub && mkdir sub &&
	git diff >actual &&
	test_cmp expect.nosub actual
'

test_expect_success 'combined (with submodule)' '
	rm -fr sub &&
	git clone --no-checkout . sub &&
	git diff >actual &&
	test_cmp expect.withsub actual
'


test_done
Commit	Line	Data
2b459b48 JH	1	#!/bin/sh
	2
	3	test_description='difference in submodules'
	4
	5	. ./test-lib.sh
bfdbee98	6	. "$TEST_DIRECTORY"/diff-lib.sh
2b459b48	7
2b459b48 JH	8	test_expect_success setup '
	9	test_tick &&
	10	test_create_repo sub &&
	11	(
	12	cd sub &&
	13	echo hello >world &&
	14	git add world &&
	15	git commit -m submodule
	16	) &&
	17
	18	test_tick &&
	19	echo frotz >nitfol &&
	20	git add nitfol sub &&
	21	git commit -m superproject &&
	22
	23	(
	24	cd sub &&
	25	echo goodbye >world &&
	26	git add world &&
	27	git commit -m "submodule #2"
	28	) &&
	29
	30	set x $(
	31	cd sub &&
	32	git rev-list HEAD
	33	) &&
8125a58b	34	echo ":160000 160000 $3 $ZERO_OID M sub" >expect &&
8e08b419	35	subtip=$3 subprev=$2
2b459b48 JH	36	'
	37
	38	test_expect_success 'git diff --raw HEAD' '
	39	git diff --raw --abbrev=40 HEAD >actual &&
82ebb0b6	40	test_cmp expect actual
2b459b48 JH	41	'
	42
	43	test_expect_success 'git diff-index --raw HEAD' '
	44	git diff-index --raw HEAD >actual.index &&
82ebb0b6	45	test_cmp expect actual.index
2b459b48 JH	46	'
	47
	48	test_expect_success 'git diff-files --raw' '
	49	git diff-files --raw >actual.files &&
82ebb0b6	50	test_cmp expect actual.files
2b459b48 JH	51	'
2b459b48 JH	52
8e08b419 JH	53	expect_from_to () {
	54	printf "%sSubproject commit %s\n+Subproject commit %s\n" \
	55	"-" "$1" "$2"
	56	}
	57
	58	test_expect_success 'git diff HEAD' '
	59	git diff HEAD >actual &&
	60	sed -e "1,/^@@/d" actual >actual.body &&
	61	expect_from_to >expect.body $subtip $subprev &&
	62	test_cmp expect.body actual.body
	63	'
	64
	65	test_expect_success 'git diff HEAD with dirty submodule (work tree)' '
	66	echo >>sub/world &&
	67	git diff HEAD >actual &&
	68	sed -e "1,/^@@/d" actual >actual.body &&
	69	expect_from_to >expect.body $subtip $subprev-dirty &&
	70	test_cmp expect.body actual.body
	71	'
	72
	73	test_expect_success 'git diff HEAD with dirty submodule (index)' '
	74	(
	75	cd sub &&
	76	git reset --hard &&
	77	echo >>world &&
	78	git add world
	79	) &&
	80	git diff HEAD >actual &&
	81	sed -e "1,/^@@/d" actual >actual.body &&
	82	expect_from_to >expect.body $subtip $subprev-dirty &&
	83	test_cmp expect.body actual.body
	84	'
	85
	86	test_expect_success 'git diff HEAD with dirty submodule (untracked)' '
	87	(
	88	cd sub &&
	89	git reset --hard &&
	90	git clean -qfdx &&
	91	>cruft
	92	) &&
	93	git diff HEAD >actual &&
	94	sed -e "1,/^@@/d" actual >actual.body &&
	95	expect_from_to >expect.body $subtip $subprev-dirty &&
	96	test_cmp expect.body actual.body
	97	'
	98
	99	test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)' '
	100	git commit -m "x" sub &&
	101	echo >>sub/world &&
	102	git diff HEAD >actual &&
	103	sed -e "1,/^@@/d" actual >actual.body &&
	104	expect_from_to >expect.body $subprev $subprev-dirty &&
dd44d419 JL	105	test_cmp expect.body actual.body &&
dd44d419 JL	106	git diff --ignore-submodules HEAD >actual2 &&
ec10b018	107	test_must_be_empty actual2 &&
dd44d419 JL	108	git diff --ignore-submodules=untracked HEAD >actual3 &&
	109	sed -e "1,/^@@/d" actual3 >actual3.body &&
	110	expect_from_to >expect.body $subprev $subprev-dirty &&
	111	test_cmp expect.body actual3.body &&
	112	git diff --ignore-submodules=dirty HEAD >actual4 &&
ec10b018	113	test_must_be_empty actual4
8e08b419	114	'
6ed7ddaa	115
302ad7a9	116	test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
90e14525 JL	117	git config diff.ignoreSubmodules dirty &&
90e14525 JL	118	git diff HEAD >actual &&
ec10b018	119	test_must_be_empty actual &&
302ad7a9 JL	120	git config --add -f .gitmodules submodule.subname.ignore none &&
	121	git config --add -f .gitmodules submodule.subname.path sub &&
	122	git diff HEAD >actual &&
	123	sed -e "1,/^@@/d" actual >actual.body &&
	124	expect_from_to >expect.body $subprev $subprev-dirty &&
	125	test_cmp expect.body actual.body &&
	126	git config -f .gitmodules submodule.subname.ignore all &&
	127	git config -f .gitmodules submodule.subname.path sub &&
	128	git diff HEAD >actual2 &&
ec10b018	129	test_must_be_empty actual2 &&
302ad7a9 JL	130	git config -f .gitmodules submodule.subname.ignore untracked &&
	131	git diff HEAD >actual3 &&
	132	sed -e "1,/^@@/d" actual3 >actual3.body &&
	133	expect_from_to >expect.body $subprev $subprev-dirty &&
	134	test_cmp expect.body actual3.body &&
	135	git config -f .gitmodules submodule.subname.ignore dirty &&
	136	git diff HEAD >actual4 &&
ec10b018	137	test_must_be_empty actual4 &&
302ad7a9 JL	138	git config submodule.subname.ignore none &&
	139	git config submodule.subname.path sub &&
	140	git diff HEAD >actual &&
	141	sed -e "1,/^@@/d" actual >actual.body &&
	142	expect_from_to >expect.body $subprev $subprev-dirty &&
	143	test_cmp expect.body actual.body &&
	144	git config --remove-section submodule.subname &&
	145	git config --remove-section -f .gitmodules submodule.subname &&
90e14525	146	git config --unset diff.ignoreSubmodules &&
302ad7a9 JL	147	rm .gitmodules
	148	'
	149
8e08b419 JH	150	test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
	151	(
	152	cd sub &&
	153	git reset --hard &&
	154	echo >>world &&
	155	git add world
	156	) &&
	157	git diff HEAD >actual &&
	158	sed -e "1,/^@@/d" actual >actual.body &&
	159	expect_from_to >expect.body $subprev $subprev-dirty &&
	160	test_cmp expect.body actual.body
	161	'
	162
	163	test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)' '
	164	(
	165	cd sub &&
	166	git reset --hard &&
	167	git clean -qfdx &&
	168	>cruft
	169	) &&
	170	git diff HEAD >actual &&
	171	sed -e "1,/^@@/d" actual >actual.body &&
	172	expect_from_to >expect.body $subprev $subprev-dirty &&
dd44d419 JL	173	test_cmp expect.body actual.body &&
dd44d419 JL	174	git diff --ignore-submodules=all HEAD >actual2 &&
ec10b018	175	test_must_be_empty actual2 &&
dd44d419	176	git diff --ignore-submodules=untracked HEAD >actual3 &&
ec10b018	177	test_must_be_empty actual3 &&
dd44d419	178	git diff --ignore-submodules=dirty HEAD >actual4 &&
ec10b018	179	test_must_be_empty actual4
8e08b419 JH	180	'
8e08b419 JH	181
302ad7a9 JL	182	test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
	183	git config --add -f .gitmodules submodule.subname.ignore all &&
	184	git config --add -f .gitmodules submodule.subname.path sub &&
	185	git diff HEAD >actual2 &&
ec10b018	186	test_must_be_empty actual2 &&
302ad7a9 JL	187	git config -f .gitmodules submodule.subname.ignore untracked &&
302ad7a9 JL	188	git diff HEAD >actual3 &&
ec10b018	189	test_must_be_empty actual3 &&
302ad7a9 JL	190	git config -f .gitmodules submodule.subname.ignore dirty &&
302ad7a9 JL	191	git diff HEAD >actual4 &&
ec10b018	192	test_must_be_empty actual4 &&
302ad7a9 JL	193	git config submodule.subname.ignore none &&
	194	git config submodule.subname.path sub &&
	195	git diff HEAD >actual &&
	196	sed -e "1,/^@@/d" actual >actual.body &&
	197	expect_from_to >expect.body $subprev $subprev-dirty &&
	198	test_cmp expect.body actual.body &&
	199	git config --remove-section submodule.subname &&
	200	git config --remove-section -f .gitmodules submodule.subname &&
	201	rm .gitmodules
	202	'
	203
aee9c7d6 JL	204	test_expect_success 'git diff between submodule commits' '
	205	git diff HEAD^..HEAD >actual &&
	206	sed -e "1,/^@@/d" actual >actual.body &&
	207	expect_from_to >expect.body $subtip $subprev &&
	208	test_cmp expect.body actual.body &&
	209	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
	210	sed -e "1,/^@@/d" actual >actual.body &&
	211	expect_from_to >expect.body $subtip $subprev &&
	212	test_cmp expect.body actual.body &&
	213	git diff --ignore-submodules HEAD^..HEAD >actual &&
ec10b018	214	test_must_be_empty actual
aee9c7d6 JL	215	'
aee9c7d6 JL	216
302ad7a9 JL	217	test_expect_success 'git diff between submodule commits [.gitmodules]' '
	218	git diff HEAD^..HEAD >actual &&
	219	sed -e "1,/^@@/d" actual >actual.body &&
	220	expect_from_to >expect.body $subtip $subprev &&
	221	test_cmp expect.body actual.body &&
	222	git config --add -f .gitmodules submodule.subname.ignore dirty &&
	223	git config --add -f .gitmodules submodule.subname.path sub &&
	224	git diff HEAD^..HEAD >actual &&
	225	sed -e "1,/^@@/d" actual >actual.body &&
	226	expect_from_to >expect.body $subtip $subprev &&
	227	test_cmp expect.body actual.body &&
	228	git config -f .gitmodules submodule.subname.ignore all &&
	229	git diff HEAD^..HEAD >actual &&
ec10b018	230	test_must_be_empty actual &&
302ad7a9 JL	231	git config submodule.subname.ignore dirty &&
	232	git config submodule.subname.path sub &&
	233	git diff HEAD^..HEAD >actual &&
	234	sed -e "1,/^@@/d" actual >actual.body &&
	235	expect_from_to >expect.body $subtip $subprev &&
	236	git config --remove-section submodule.subname &&
	237	git config --remove-section -f .gitmodules submodule.subname &&
	238	rm .gitmodules
	239	'
	240
1392a377	241	test_expect_success 'git diff (empty submodule dir)' '
7c08a2a6 PY	242	rm -rf sub/* sub/.git &&
7c08a2a6 PY	243	git diff > actual.empty &&
1c5e94f4	244	test_must_be_empty actual.empty
7c08a2a6 PY	245	'
7c08a2a6 PY	246
7dae8b21 JH	247	test_expect_success 'conflicted submodule setup' '
	248
	249	# 39 efs
a48fcd83	250	c=fffffffffffffffffffffffffffffffffffffff &&
7dae8b21	251	(
8125a58b	252	echo "000000 $ZERO_OID 0 sub" &&
a48fcd83 JN	253	echo "160000 1$c 1 sub" &&
a48fcd83 JN	254	echo "160000 2$c 2 sub" &&
7dae8b21 JH	255	echo "160000 3$c 3 sub"
	256	) \| git update-index --index-info &&
	257	echo >expect.nosub '\''diff --cc sub
	258	index 2ffffff,3ffffff..0000000
	259	--- a/sub
	260	+++ b/sub
	261	@@@ -1,1 -1,1 +1,1 @@@
	262	- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
	263	-Subproject commit 3fffffffffffffffffffffffffffffffffffffff
	264	++Subproject commit 0000000000000000000000000000000000000000'\'' &&
	265
	266	hh=$(git rev-parse HEAD) &&
8125a58b	267	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
7dae8b21 JH	268
	269	'
	270
	271	test_expect_success 'combined (empty submodule)' '
	272	rm -fr sub && mkdir sub &&
	273	git diff >actual &&
	274	test_cmp expect.nosub actual
	275	'
	276
	277	test_expect_success 'combined (with submodule)' '
	278	rm -fr sub &&
	279	git clone --no-checkout . sub &&
	280	git diff >actual &&
	281	test_cmp expect.withsub actual
	282	'
	283
	284
	285
2b459b48	286	test_done