[thirdparty/git.git] / t / t7001-mv.sh

#!/bin/sh

test_description='git mv in subdirs'
. ./test-lib.sh

test_expect_success \
    'prepare reference tree' \
    'mkdir path0 path1 &&
     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
     git add path0/COPYING &&
     git commit -m add -a'

test_expect_success \
    'moving the file out of subdirectory' \
    'cd path0 && git mv COPYING ../path1/COPYING'

# in path0 currently
test_expect_success \
    'commiting the change' \
    'cd .. && git commit -m move-out -a'

test_expect_success \
    'checking the commit' \
    'git diff-tree -r -M --name-status  HEAD^ HEAD | \
    grep "^R100..*path0/COPYING..*path1/COPYING"'

test_expect_success \
    'moving the file back into subdirectory' \
    'cd path0 && git mv ../path1/COPYING COPYING'

# in path0 currently
test_expect_success \
    'commiting the change' \
    'cd .. && git commit -m move-in -a'

test_expect_success \
    'checking the commit' \
    'git diff-tree -r -M --name-status  HEAD^ HEAD | \
    grep "^R100..*path1/COPYING..*path0/COPYING"'

test_expect_success \
    'checking -k on non-existing file' \
    'git mv -k idontexist path0'

test_expect_success \
    'checking -k on untracked file' \
    'touch untracked1 &&
     git mv -k untracked1 path0 &&
     test -f untracked1 &&
     test ! -f path0/untracked1'

test_expect_success \
    'checking -k on multiple untracked files' \
    'touch untracked2 &&
     git mv -k untracked1 untracked2 path0 &&
     test -f untracked1 &&
     test -f untracked2 &&
     test ! -f path0/untracked1 &&
     test ! -f path0/untracked2'

test_expect_success \
    'checking -f on untracked file with existing target' \
    'touch path0/untracked1 &&
     test_must_fail git mv -f untracked1 path0 &&
     test ! -f .git/index.lock &&
     test -f untracked1 &&
     test -f path0/untracked1'

# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
     path0/idontexist path0/untracked1 path0/untracked2 \
     .git/index.lock

test_expect_success \
    'adding another file' \
    'cp "$TEST_DIRECTORY"/../README path0/README &&
     git add path0/README &&
     git commit -m add2 -a'

test_expect_success \
    'moving whole subdirectory' \
    'git mv path0 path2'

test_expect_success \
    'commiting the change' \
    'git commit -m dir-move -a'

test_expect_success \
    'checking the commit' \
    'git diff-tree -r -M --name-status  HEAD^ HEAD | \
     grep "^R100..*path0/COPYING..*path2/COPYING" &&
     git diff-tree -r -M --name-status  HEAD^ HEAD | \
     grep "^R100..*path0/README..*path2/README"'

test_expect_success \
    'succeed when source is a prefix of destination' \
    'git mv path2/COPYING path2/COPYING-renamed'

test_expect_success \
    'moving whole subdirectory into subdirectory' \
    'git mv path2 path1'

test_expect_success \
    'commiting the change' \
    'git commit -m dir-move -a'

test_expect_success \
    'checking the commit' \
    'git diff-tree -r -M --name-status  HEAD^ HEAD | \
     grep "^R100..*path2/COPYING..*path1/path2/COPYING" &&
     git diff-tree -r -M --name-status  HEAD^ HEAD | \
     grep "^R100..*path2/README..*path1/path2/README"'

test_expect_success \
    'do not move directory over existing directory' \
    'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'

test_expect_success \
    'move into "."' \
    'git mv path1/path2/ .'

test_expect_success "Michael Cassar's test case" '
	rm -fr .git papers partA &&
	git init &&
	mkdir -p papers/unsorted papers/all-papers partA &&
	echo a > papers/unsorted/Thesis.pdf &&
	echo b > partA/outline.txt &&
	echo c > papers/unsorted/_another &&
	git add papers partA &&
	T1=`git write-tree` &&

	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&

	T=`git write-tree` &&
	git ls-tree -r $T | grep partA/outline.txt || {
		git ls-tree -r $T
		(exit 1)
	}
'

rm -fr papers partA path?

test_expect_success "Sergey Vlasov's test case" '
	rm -fr .git &&
	git init &&
	mkdir ab &&
	date >ab.c &&
	date >ab/d &&
	git add ab.c ab &&
	git commit -m 'initial' &&
	git mv ab a
'

test_expect_success 'absolute pathname' '(

	rm -fr mine &&
	mkdir mine &&
	cd mine &&
	test_create_repo one &&
	cd one &&
	mkdir sub &&
	>sub/file &&
	git add sub/file &&

	git mv sub "$(pwd)/in" &&
	! test -d sub &&
	test -d in &&
	git ls-files --error-unmatch in/file


)'

test_expect_success 'absolute pathname outside should fail' '(

	rm -fr mine &&
	mkdir mine &&
	cd mine &&
	out=$(pwd) &&
	test_create_repo one &&
	cd one &&
	mkdir sub &&
	>sub/file &&
	git add sub/file &&

	test_must_fail git mv sub "$out/out" &&
	test -d sub &&
	! test -d ../in &&
	git ls-files --error-unmatch sub/file

)'

test_expect_success 'git mv to move multiple sources into a directory' '
	rm -fr .git && git init &&
	mkdir dir other &&
	>dir/a.txt &&
	>dir/b.txt &&
	git add dir/?.txt &&
	git mv dir/a.txt dir/b.txt other &&
	git ls-files >actual &&
	{ echo other/a.txt; echo other/b.txt; } >expect &&
	test_cmp expect actual
'

test_expect_success 'git mv should not change sha1 of moved cache entry' '

	rm -fr .git &&
	git init &&
	echo 1 >dirty &&
	git add dirty &&
	entry="$(git ls-files --stage dirty | cut -f 1)" &&
	git mv dirty dirty2 &&
	[ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
	echo 2 >dirty2 &&
	git mv dirty2 dirty &&
	[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]

'

rm -f dirty dirty2

test_expect_success 'git mv should overwrite symlink to a file' '

	rm -fr .git &&
	git init &&
	echo 1 >moved &&
	test_ln_s_add moved symlink &&
	git add moved &&
	test_must_fail git mv moved symlink &&
	git mv -f moved symlink &&
	! test -e moved &&
	test -f symlink &&
	test "$(cat symlink)" = 1 &&
	git update-index --refresh &&
	git diff-files --quiet

'

rm -f moved symlink

test_expect_success 'git mv should overwrite file with a symlink' '

	rm -fr .git &&
	git init &&
	echo 1 >moved &&
	test_ln_s_add moved symlink &&
	git add moved &&
	test_must_fail git mv symlink moved &&
	git mv -f symlink moved &&
	! test -e symlink &&
	git update-index --refresh &&
	git diff-files --quiet

'

test_expect_success SYMLINKS 'check moved symlink' '

	test -h moved
'

rm -f moved symlink

test_expect_success 'setup submodule' '
	git commit -m initial &&
	git reset --hard &&
	git submodule add ./. sub &&
	echo content >file &&
	git add file &&
	git commit -m "added sub and file"
'

test_expect_success 'git mv cannot move a submodule in a file' '
	test_must_fail git mv sub file
'

test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
	entry="$(git ls-files --stage sub | cut -f 1)" &&
	git rm .gitmodules &&
	(
		cd sub &&
		rm -f .git &&
		cp -a ../.git/modules/sub .git &&
		GIT_WORK_TREE=. git config --unset core.worktree
	) &&
	mkdir mod &&
	git mv sub mod/sub &&
	! test -e sub &&
	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
	(
		cd mod/sub &&
		git status
	) &&
	git update-index --refresh &&
	git diff-files --quiet
'

test_expect_success 'git mv moves a submodule with gitfile' '
	rm -rf mod/sub &&
	git reset --hard &&
	git submodule update &&
	entry="$(git ls-files --stage sub | cut -f 1)" &&
	(
		cd mod &&
		git mv ../sub/ .
	) &&
	! test -e sub &&
	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
	(
		cd mod/sub &&
		git status
	) &&
	echo mod/sub >expected &&
	git config -f .gitmodules submodule.sub.path >actual &&
	test_cmp expected actual &&
	git update-index --refresh &&
	git diff-files --quiet
'

test_expect_success 'mv does not complain when no .gitmodules file is found' '
	rm -rf mod/sub &&
	git reset --hard &&
	git submodule update &&
	git rm .gitmodules &&
	entry="$(git ls-files --stage sub | cut -f 1)" &&
	git mv sub mod/sub 2>actual.err &&
	! test -s actual.err &&
	! test -e sub &&
	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
	(
		cd mod/sub &&
		git status
	) &&
	git update-index --refresh &&
	git diff-files --quiet
'

test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '
	rm -rf mod/sub &&
	git reset --hard &&
	git submodule update &&
	git config -f .gitmodules foo.bar true &&
	entry="$(git ls-files --stage sub | cut -f 1)" &&
	test_must_fail git mv sub mod/sub 2>actual.err &&
	test -s actual.err &&
	test -e sub &&
	git diff-files --quiet -- sub &&
	git add .gitmodules &&
	git mv sub mod/sub 2>actual.err &&
	! test -s actual.err &&
	! test -e sub &&
	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
	(
		cd mod/sub &&
		git status
	) &&
	git update-index --refresh &&
	git diff-files --quiet
'

test_expect_success 'mv issues a warning when section is not found in .gitmodules' '
	rm -rf mod/sub &&
	git reset --hard &&
	git submodule update &&
	git config -f .gitmodules --remove-section submodule.sub &&
	git add .gitmodules &&
	entry="$(git ls-files --stage sub | cut -f 1)" &&
	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
	git mv sub mod/sub 2>actual.err &&
	test_i18ncmp expect.err actual.err &&
	! test -e sub &&
	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
	(
		cd mod/sub &&
		git status
	) &&
	git update-index --refresh &&
	git diff-files --quiet
'

test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
	rm -rf mod/sub &&
	git reset --hard &&
	git submodule update &&
	git mv -n sub mod/sub 2>actual.err &&
	test -f sub/.git &&
	git diff-index --exit-code HEAD &&
	git update-index --refresh &&
	git diff-files --quiet -- sub .gitmodules
'

test_done
Commit	Line	Data
8bf2c69c AR	1	#!/bin/sh
8bf2c69c AR	2
5be60078	3	test_description='git mv in subdirs'
8bf2c69c AR	4	. ./test-lib.sh
	5
	6	test_expect_success \
	7	'prepare reference tree' \
	8	'mkdir path0 path1 &&
bfdbee98	9	cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
5be60078	10	git add path0/COPYING &&
d592b315	11	git commit -m add -a'
8bf2c69c AR	12
8bf2c69c AR	13	test_expect_success \
90924d55	14	'moving the file out of subdirectory' \
5be60078	15	'cd path0 && git mv COPYING ../path1/COPYING'
8bf2c69c AR	16
	17	# in path0 currently
	18	test_expect_success \
	19	'commiting the change' \
d592b315	20	'cd .. && git commit -m move-out -a'
8bf2c69c AR	21
	22	test_expect_success \
	23	'checking the commit' \
5be60078	24	'git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	25	grep "^R100..path0/COPYING..path1/COPYING"'
8bf2c69c	26
90924d55 JW	27	test_expect_success \
90924d55 JW	28	'moving the file back into subdirectory' \
5be60078	29	'cd path0 && git mv ../path1/COPYING COPYING'
90924d55 JW	30
	31	# in path0 currently
	32	test_expect_success \
	33	'commiting the change' \
d592b315	34	'cd .. && git commit -m move-in -a'
90924d55 JW	35
	36	test_expect_success \
	37	'checking the commit' \
5be60078	38	'git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	39	grep "^R100..path1/COPYING..path0/COPYING"'
90924d55	40
3772923f MG	41	test_expect_success \
	42	'checking -k on non-existing file' \
	43	'git mv -k idontexist path0'
	44
	45	test_expect_success \
	46	'checking -k on untracked file' \
	47	'touch untracked1 &&
	48	git mv -k untracked1 path0 &&
	49	test -f untracked1 &&
	50	test ! -f path0/untracked1'
	51
be17262d	52	test_expect_success \
3772923f MG	53	'checking -k on multiple untracked files' \
	54	'touch untracked2 &&
	55	git mv -k untracked1 untracked2 path0 &&
	56	test -f untracked1 &&
	57	test -f untracked2 &&
720ec6b8	58	test ! -f path0/untracked1 &&
3772923f MG	59	test ! -f path0/untracked2'
3772923f MG	60
5aed3c6a	61	test_expect_success \
c8ba6b1b MM	62	'checking -f on untracked file with existing target' \
c8ba6b1b MM	63	'touch path0/untracked1 &&
a2b1e53b	64	test_must_fail git mv -f untracked1 path0 &&
c8ba6b1b MM	65	test ! -f .git/index.lock &&
	66	test -f untracked1 &&
	67	test -f path0/untracked1'
	68
3772923f MG	69	# clean up the mess in case bad things happen
	70	rm -f idontexist untracked1 untracked2 \
	71	path0/idontexist path0/untracked1 path0/untracked2 \
	72	.git/index.lock
	73
afd22296 JW	74	test_expect_success \
afd22296 JW	75	'adding another file' \
bfdbee98	76	'cp "$TEST_DIRECTORY"/../README path0/README &&
5be60078	77	git add path0/README &&
d592b315	78	git commit -m add2 -a'
afd22296 JW	79
	80	test_expect_success \
	81	'moving whole subdirectory' \
5be60078	82	'git mv path0 path2'
afd22296 JW	83
	84	test_expect_success \
	85	'commiting the change' \
d592b315	86	'git commit -m dir-move -a'
afd22296 JW	87
	88	test_expect_success \
	89	'checking the commit' \
5be60078	90	'git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	91	grep "^R100..path0/COPYING..path2/COPYING" &&
5be60078	92	git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	93	grep "^R100..path0/README..path2/README"'
afd22296	94
1d6249e6 JS	95	test_expect_success \
1d6249e6 JS	96	'succeed when source is a prefix of destination' \
5be60078	97	'git mv path2/COPYING path2/COPYING-renamed'
1d6249e6	98
a1dad607 JS	99	test_expect_success \
a1dad607 JS	100	'moving whole subdirectory into subdirectory' \
5be60078	101	'git mv path2 path1'
a1dad607 JS	102
	103	test_expect_success \
	104	'commiting the change' \
d592b315	105	'git commit -m dir-move -a'
a1dad607 JS	106
	107	test_expect_success \
	108	'checking the commit' \
5be60078	109	'git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	110	grep "^R100..path2/COPYING..path1/path2/COPYING" &&
5be60078	111	git diff-tree -r -M --name-status HEAD^ HEAD \| \
90ed6c05	112	grep "^R100..path2/README..path1/path2/README"'
a1dad607	113
41ac414e	114	test_expect_success \
ac64a722	115	'do not move directory over existing directory' \
d492b31c	116	'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
ac64a722	117
c5203bdf JS	118	test_expect_success \
c5203bdf JS	119	'move into "."' \
5be60078	120	'git mv path1/path2/ .'
c5203bdf	121
4fddf579 JH	122	test_expect_success "Michael Cassar's test case" '
4fddf579 JH	123	rm -fr .git papers partA &&
5c94f87e	124	git init &&
4fddf579 JH	125	mkdir -p papers/unsorted papers/all-papers partA &&
	126	echo a > papers/unsorted/Thesis.pdf &&
	127	echo b > partA/outline.txt &&
	128	echo c > papers/unsorted/_another &&
	129	git add papers partA &&
	130	T1=`git write-tree` &&
	131
	132	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
	133
	134	T=`git write-tree` &&
	135	git ls-tree -r $T \| grep partA/outline.txt \|\| {
	136	git ls-tree -r $T
	137	(exit 1)
	138	}
	139	'
	140
aca085e5 JS	141	rm -fr papers partA path?
	142
	143	test_expect_success "Sergey Vlasov's test case" '
	144	rm -fr .git &&
5c94f87e	145	git init &&
aca085e5 JS	146	mkdir ab &&
	147	date >ab.c &&
	148	date >ab/d &&
	149	git add ab.c ab &&
	150	git commit -m 'initial' &&
	151	git mv ab a
	152	'
	153
744dacd3 JH	154	test_expect_success 'absolute pathname' '(
	155
	156	rm -fr mine &&
	157	mkdir mine &&
	158	cd mine &&
	159	test_create_repo one &&
	160	cd one &&
	161	mkdir sub &&
	162	>sub/file &&
	163	git add sub/file &&
	164
	165	git mv sub "$(pwd)/in" &&
	166	! test -d sub &&
	167	test -d in &&
	168	git ls-files --error-unmatch in/file
	169
	170
	171	)'
	172
	173	test_expect_success 'absolute pathname outside should fail' '(
	174
	175	rm -fr mine &&
	176	mkdir mine &&
	177	cd mine &&
	178	out=$(pwd) &&
	179	test_create_repo one &&
	180	cd one &&
	181	mkdir sub &&
	182	>sub/file &&
	183	git add sub/file &&
	184
d492b31c	185	test_must_fail git mv sub "$out/out" &&
744dacd3 JH	186	test -d sub &&
	187	! test -d ../in &&
	188	git ls-files --error-unmatch sub/file
	189
	190	)'
	191
af82559b JH	192	test_expect_success 'git mv to move multiple sources into a directory' '
	193	rm -fr .git && git init &&
	194	mkdir dir other &&
	195	>dir/a.txt &&
	196	>dir/b.txt &&
	197	git add dir/?.txt &&
	198	git mv dir/a.txt dir/b.txt other &&
	199	git ls-files >actual &&
	200	{ echo other/a.txt; echo other/b.txt; } >expect &&
	201	test_cmp expect actual
	202	'
	203
81dc2307 PB	204	test_expect_success 'git mv should not change sha1 of moved cache entry' '
	205
	206	rm -fr .git &&
	207	git init &&
	208	echo 1 >dirty &&
	209	git add dirty &&
2dec68cf	210	entry="$(git ls-files --stage dirty \| cut -f 1)" &&
81dc2307 PB	211	git mv dirty dirty2 &&
	212	[ "$entry" = "$(git ls-files --stage dirty2 \| cut -f 1)" ] &&
	213	echo 2 >dirty2 &&
	214	git mv dirty2 dirty &&
	215	[ "$entry" = "$(git ls-files --stage dirty \| cut -f 1)" ]
	216
	217	'
	218
	219	rm -f dirty dirty2
	220
889c6f0e	221	test_expect_success 'git mv should overwrite symlink to a file' '
81dc2307 PB	222
	223	rm -fr .git &&
	224	git init &&
	225	echo 1 >moved &&
889c6f0e JS	226	test_ln_s_add moved symlink &&
889c6f0e JS	227	git add moved &&
81dc2307 PB	228	test_must_fail git mv moved symlink &&
	229	git mv -f moved symlink &&
	230	! test -e moved &&
	231	test -f symlink &&
	232	test "$(cat symlink)" = 1 &&
65c35b22	233	git update-index --refresh &&
81dc2307 PB	234	git diff-files --quiet
	235
	236	'
	237
	238	rm -f moved symlink
	239
889c6f0e	240	test_expect_success 'git mv should overwrite file with a symlink' '
81dc2307 PB	241
	242	rm -fr .git &&
	243	git init &&
	244	echo 1 >moved &&
889c6f0e JS	245	test_ln_s_add moved symlink &&
889c6f0e JS	246	git add moved &&
81dc2307 PB	247	test_must_fail git mv symlink moved &&
	248	git mv -f symlink moved &&
	249	! test -e symlink &&
65c35b22	250	git update-index --refresh &&
81dc2307 PB	251	git diff-files --quiet
	252
	253	'
	254
889c6f0e JS	255	test_expect_success SYMLINKS 'check moved symlink' '
	256
	257	test -h moved
	258	'
	259
81dc2307 PB	260	rm -f moved symlink
81dc2307 PB	261
11502468 JL	262	test_expect_success 'setup submodule' '
	263	git commit -m initial &&
	264	git reset --hard &&
	265	git submodule add ./. sub &&
	266	echo content >file &&
	267	git add file &&
	268	git commit -m "added sub and file"
	269	'
	270
	271	test_expect_success 'git mv cannot move a submodule in a file' '
	272	test_must_fail git mv sub file
	273	'
	274
	275	test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
	276	entry="$(git ls-files --stage sub \| cut -f 1)" &&
	277	git rm .gitmodules &&
	278	(
	279	cd sub &&
	280	rm -f .git &&
	281	cp -a ../.git/modules/sub .git &&
	282	GIT_WORK_TREE=. git config --unset core.worktree
	283	) &&
	284	mkdir mod &&
	285	git mv sub mod/sub &&
	286	! test -e sub &&
	287	[ "$entry" = "$(git ls-files --stage mod/sub \| cut -f 1)" ] &&
	288	(
	289	cd mod/sub &&
	290	git status
	291	) &&
	292	git update-index --refresh &&
	293	git diff-files --quiet
	294	'
	295
a88c915d JL	296	test_expect_success 'git mv moves a submodule with gitfile' '
	297	rm -rf mod/sub &&
	298	git reset --hard &&
	299	git submodule update &&
	300	entry="$(git ls-files --stage sub \| cut -f 1)" &&
	301	(
	302	cd mod &&
	303	git mv ../sub/ .
	304	) &&
	305	! test -e sub &&
	306	[ "$entry" = "$(git ls-files --stage mod/sub \| cut -f 1)" ] &&
	307	(
	308	cd mod/sub &&
	309	git status
	310	) &&
0656781f JL	311	echo mod/sub >expected &&
	312	git config -f .gitmodules submodule.sub.path >actual &&
	313	test_cmp expected actual &&
a88c915d JL	314	git update-index --refresh &&
	315	git diff-files --quiet
	316	'
	317
0656781f JL	318	test_expect_success 'mv does not complain when no .gitmodules file is found' '
	319	rm -rf mod/sub &&
	320	git reset --hard &&
	321	git submodule update &&
	322	git rm .gitmodules &&
	323	entry="$(git ls-files --stage sub \| cut -f 1)" &&
	324	git mv sub mod/sub 2>actual.err &&
	325	! test -s actual.err &&
	326	! test -e sub &&
	327	[ "$entry" = "$(git ls-files --stage mod/sub \| cut -f 1)" ] &&
	328	(
	329	cd mod/sub &&
	330	git status
	331	) &&
	332	git update-index --refresh &&
	333	git diff-files --quiet
	334	'
	335
	336	test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '
	337	rm -rf mod/sub &&
	338	git reset --hard &&
	339	git submodule update &&
	340	git config -f .gitmodules foo.bar true &&
	341	entry="$(git ls-files --stage sub \| cut -f 1)" &&
	342	test_must_fail git mv sub mod/sub 2>actual.err &&
	343	test -s actual.err &&
	344	test -e sub &&
	345	git diff-files --quiet -- sub &&
	346	git add .gitmodules &&
	347	git mv sub mod/sub 2>actual.err &&
	348	! test -s actual.err &&
	349	! test -e sub &&
	350	[ "$entry" = "$(git ls-files --stage mod/sub \| cut -f 1)" ] &&
	351	(
	352	cd mod/sub &&
	353	git status
	354	) &&
	355	git update-index --refresh &&
	356	git diff-files --quiet
	357	'
	358
	359	test_expect_success 'mv issues a warning when section is not found in .gitmodules' '
	360	rm -rf mod/sub &&
	361	git reset --hard &&
	362	git submodule update &&
	363	git config -f .gitmodules --remove-section submodule.sub &&
	364	git add .gitmodules &&
	365	entry="$(git ls-files --stage sub \| cut -f 1)" &&
	366	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
	367	git mv sub mod/sub 2>actual.err &&
	368	test_i18ncmp expect.err actual.err &&
	369	! test -e sub &&
	370	[ "$entry" = "$(git ls-files --stage mod/sub \| cut -f 1)" ] &&
	371	(
	372	cd mod/sub &&
	373	git status
	374	) &&
	375	git update-index --refresh &&
	376	git diff-files --quiet
	377	'
	378
	379	test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
	380	rm -rf mod/sub &&
	381	git reset --hard &&
382	git submodule update &&
383	git mv -n sub mod/sub 2>actual.err &&
384	test -f sub/.git &&
385	git diff-index --exit-code HEAD &&
386	git update-index --refresh &&
387	git diff-files --quiet -- sub .gitmodules
388	'
389
8bf2c69c	390	test_done