3 test_description='git mv in subdirs'
7 'prepare reference tree' \
9 cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
10 git add path0/COPYING &&
14 'moving the file out of subdirectory' \
15 'cd path0 && git mv COPYING ../path1/COPYING'
19 'commiting the change' \
20 'cd .. && git commit -m move-out -a'
23 'checking the commit' \
24 'git diff-tree -r -M --name-status HEAD^ HEAD | \
25 grep "^R100..*path0/COPYING..*path1/COPYING"'
28 'moving the file back into subdirectory' \
29 'cd path0 && git mv ../path1/COPYING COPYING'
33 'commiting the change' \
34 'cd .. && git commit -m move-in -a'
37 'checking the commit' \
38 'git diff-tree -r -M --name-status HEAD^ HEAD | \
39 grep "^R100..*path1/COPYING..*path0/COPYING"'
42 'checking -k on non-existing file' \
43 'git mv -k idontexist path0'
46 'checking -k on untracked file' \
48 git mv -k untracked1 path0 &&
50 test ! -f path0/untracked1'
53 'checking -k on multiple untracked files' \
55 git mv -k untracked1 untracked2 path0 &&
58 test ! -f path0/untracked1 &&
59 test ! -f path0/untracked2'
62 'checking -f on untracked file with existing target' \
63 'touch path0/untracked1 &&
64 test_must_fail git mv -f untracked1 path0 &&
65 test ! -f .git/index.lock &&
67 test -f path0/untracked1'
69 # clean up the mess in case bad things happen
70 rm -f idontexist untracked1 untracked2 \
71 path0/idontexist path0/untracked1 path0/untracked2 \
76 'moving to absent target with trailing slash' \
77 'test_must_fail git mv path0/COPYING no-such-dir/ &&
78 test_must_fail git mv path0/COPYING no-such-dir// &&
79 git mv path0/ no-such-dir/ &&
80 test_path_is_dir no-such-dir'
87 'moving to existing untracked target with trailing slash' \
89 git mv path0/ path1/ &&
90 test_path_is_dir path1/path0/'
93 'moving to existing tracked target with trailing slash' \
95 >path2/file && git add path2/file &&
96 git mv path1/path0/ path2/ &&
97 test_path_is_dir path2/path0/'
103 test_expect_success \
104 'adding another file' \
105 'cp "$TEST_DIRECTORY"/../README path0/README &&
106 git add path0/README &&
107 git commit -m add2 -a'
109 test_expect_success \
110 'moving whole subdirectory' \
113 test_expect_success \
114 'commiting the change' \
115 'git commit -m dir-move -a'
117 test_expect_success \
118 'checking the commit' \
119 'git diff-tree -r -M --name-status HEAD^ HEAD | \
120 grep "^R100..*path0/COPYING..*path2/COPYING" &&
121 git diff-tree -r -M --name-status HEAD^ HEAD | \
122 grep "^R100..*path0/README..*path2/README"'
124 test_expect_success \
125 'succeed when source is a prefix of destination' \
126 'git mv path2/COPYING path2/COPYING-renamed'
128 test_expect_success \
129 'moving whole subdirectory into subdirectory' \
132 test_expect_success \
133 'commiting the change' \
134 'git commit -m dir-move -a'
136 test_expect_success \
137 'checking the commit' \
138 'git diff-tree -r -M --name-status HEAD^ HEAD | \
139 grep "^R100..*path2/COPYING..*path1/path2/COPYING" &&
140 git diff-tree -r -M --name-status HEAD^ HEAD | \
141 grep "^R100..*path2/README..*path1/path2/README"'
143 test_expect_success \
144 'do not move directory over existing directory' \
145 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
147 test_expect_success \
149 'git mv path1/path2/ .'
151 test_expect_success "Michael Cassar's test case" '
152 rm -fr .git papers partA &&
154 mkdir -p papers/unsorted papers/all-papers partA &&
155 echo a > papers/unsorted/Thesis.pdf &&
156 echo b > partA/outline.txt &&
157 echo c > papers/unsorted/_another &&
158 git add papers partA &&
159 T1=`git write-tree` &&
161 git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
163 T=`git write-tree` &&
164 git ls-tree -r $T | grep partA/outline.txt || {
170 rm -fr papers partA path?
172 test_expect_success "Sergey Vlasov's test case" '
179 git commit -m 'initial' &&
183 test_expect_success 'absolute pathname' '(
188 test_create_repo one &&
194 git mv sub "$(pwd)/in" &&
197 git ls-files --error-unmatch in/file
202 test_expect_success 'absolute pathname outside should fail' '(
208 test_create_repo one &&
214 test_must_fail git mv sub "$out/out" &&
217 git ls-files --error-unmatch sub/file
221 test_expect_success 'git mv to move multiple sources into a directory' '
222 rm -fr .git && git init &&
227 git mv dir/a.txt dir/b.txt other &&
228 git ls-files >actual &&
229 { echo other/a.txt; echo other/b.txt; } >expect &&
230 test_cmp expect actual
233 test_expect_success 'git mv should not change sha1 of moved cache entry' '
239 entry="$(git ls-files --stage dirty | cut -f 1)" &&
240 git mv dirty dirty2 &&
241 [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
243 git mv dirty2 dirty &&
244 [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
250 test_expect_success 'git mv should overwrite symlink to a file' '
255 test_ln_s_add moved symlink &&
257 test_must_fail git mv moved symlink &&
258 git mv -f moved symlink &&
261 test "$(cat symlink)" = 1 &&
262 git update-index --refresh &&
263 git diff-files --quiet
269 test_expect_success 'git mv should overwrite file with a symlink' '
274 test_ln_s_add moved symlink &&
276 test_must_fail git mv symlink moved &&
277 git mv -f symlink moved &&
279 git update-index --refresh &&
280 git diff-files --quiet
284 test_expect_success SYMLINKS 'check moved symlink' '
291 test_expect_success 'setup submodule' '
292 git commit -m initial &&
294 git submodule add ./. sub &&
295 echo content >file &&
297 git commit -m "added sub and file" &&
301 test_expect_success 'git mv cannot move a submodule in a file' '
302 test_must_fail git mv sub file
305 test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
306 entry="$(git ls-files --stage sub | cut -f 1)" &&
307 git rm .gitmodules &&
311 cp -R -P -p ../.git/modules/sub .git &&
312 GIT_WORK_TREE=. git config --unset core.worktree
315 git mv sub mod/sub &&
317 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
322 git update-index --refresh &&
323 git diff-files --quiet
326 test_expect_success 'git mv moves a submodule with a .git directory and .gitmodules' '
329 git submodule update &&
330 entry="$(git ls-files --stage sub | cut -f 1)" &&
334 cp -R -P -p ../.git/modules/sub .git &&
335 GIT_WORK_TREE=. git config --unset core.worktree
338 git mv sub mod/sub &&
340 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
345 echo mod/sub >expected &&
346 git config -f .gitmodules submodule.sub.path >actual &&
347 test_cmp expected actual &&
348 git update-index --refresh &&
349 git diff-files --quiet
352 test_expect_success 'git mv moves a submodule with gitfile' '
355 git submodule update &&
356 entry="$(git ls-files --stage sub | cut -f 1)" &&
362 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
367 echo mod/sub >expected &&
368 git config -f .gitmodules submodule.sub.path >actual &&
369 test_cmp expected actual &&
370 git update-index --refresh &&
371 git diff-files --quiet
374 test_expect_success 'mv does not complain when no .gitmodules file is found' '
377 git submodule update &&
378 git rm .gitmodules &&
379 entry="$(git ls-files --stage sub | cut -f 1)" &&
380 git mv sub mod/sub 2>actual.err &&
381 ! test -s actual.err &&
383 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
388 git update-index --refresh &&
389 git diff-files --quiet
392 test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '
395 git submodule update &&
396 git config -f .gitmodules foo.bar true &&
397 entry="$(git ls-files --stage sub | cut -f 1)" &&
398 test_must_fail git mv sub mod/sub 2>actual.err &&
399 test -s actual.err &&
401 git diff-files --quiet -- sub &&
402 git add .gitmodules &&
403 git mv sub mod/sub 2>actual.err &&
404 ! test -s actual.err &&
406 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
411 git update-index --refresh &&
412 git diff-files --quiet
415 test_expect_success 'mv issues a warning when section is not found in .gitmodules' '
418 git submodule update &&
419 git config -f .gitmodules --remove-section submodule.sub &&
420 git add .gitmodules &&
421 entry="$(git ls-files --stage sub | cut -f 1)" &&
422 echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
423 git mv sub mod/sub 2>actual.err &&
424 test_i18ncmp expect.err actual.err &&
426 [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
431 git update-index --refresh &&
432 git diff-files --quiet
435 test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
438 git submodule update &&
439 git mv -n sub mod/sub 2>actual.err &&
441 git diff-index --exit-code HEAD &&
442 git update-index --refresh &&
443 git diff-files --quiet -- sub .gitmodules
446 test_expect_success 'checking out a commit before submodule moved needs manual updates' '
448 git commit -m "moved sub to sub2" &&
449 git checkout -q HEAD^ 2>actual &&
450 test_i18ngrep "^warning: unable to rmdir sub2:" actual &&
451 git status -s sub2 >actual &&
452 echo "?? sub2/" >expected &&
453 test_cmp expected actual &&
454 ! test -f sub/.git &&
456 git submodule update &&
459 git diff-index --exit-code HEAD &&
460 git update-index --refresh &&
461 git diff-files --quiet -- sub .gitmodules &&
462 git status -s sub2 >actual &&
466 test_expect_success 'mv -k does not accidentally destroy submodules' '
467 git checkout submodule &&
469 git mv -k dummy sub dest &&
470 git status --porcelain >actual &&
471 grep "^R sub -> dest/sub" actual &&