| #!/bin/sh |
| |
| test_description='git-mv in subdirs' |
| . ./test-lib.sh |
| |
| test_expect_success \ |
| 'prepare reference tree' \ |
| 'mkdir path0 path1 && |
| cp ../../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 -E "^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 -E "^R100.+path1/COPYING.+path0/COPYING"' |
| |
| test_expect_success \ |
| 'adding another file' \ |
| 'cp ../../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 -E "^R100.+path0/COPYING.+path2/COPYING" && |
| git-diff-tree -r -M --name-status HEAD^ HEAD | \ |
| grep -E "^R100.+path0/README.+path2/README"' |
| |
| 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 -E "^R100.+path2/COPYING.+path1/path2/COPYING" && |
| git-diff-tree -r -M --name-status HEAD^ HEAD | \ |
| grep -E "^R100.+path2/README.+path1/path2/README"' |
| |
| test_expect_failure \ |
| 'do not move directory over existing directory' \ |
| 'mkdir path0 && mkdir path0/path2 && git-mv path2 path0' |
| |
| test_done |