http-push: avoid fork() by calling merge_bases() directly
[git/jrn.git] / t / t7001-mv.sh
blob900ca93cde02f82c35a59ee99349f9d0c4213867
1 #!/bin/sh
3 test_description='git-mv in subdirs'
4 . ./test-lib.sh
6 test_expect_success \
7 'prepare reference tree' \
8 'mkdir path0 path1 &&
9 cp ../../COPYING path0/COPYING &&
10 git-add path0/COPYING &&
11 git-commit -m add -a'
13 test_expect_success \
14 'moving the file out of subdirectory' \
15 'cd path0 && git-mv COPYING ../path1/COPYING'
17 # in path0 currently
18 test_expect_success \
19 'commiting the change' \
20 'cd .. && git-commit -m move-out -a'
22 test_expect_success \
23 'checking the commit' \
24 'git-diff-tree -r -M --name-status HEAD^ HEAD | \
25 grep -E "^R100.+path0/COPYING.+path1/COPYING"'
27 test_expect_success \
28 'moving the file back into subdirectory' \
29 'cd path0 && git-mv ../path1/COPYING COPYING'
31 # in path0 currently
32 test_expect_success \
33 'commiting the change' \
34 'cd .. && git-commit -m move-in -a'
36 test_expect_success \
37 'checking the commit' \
38 'git-diff-tree -r -M --name-status HEAD^ HEAD | \
39 grep -E "^R100.+path1/COPYING.+path0/COPYING"'
41 test_expect_success \
42 'adding another file' \
43 'cp ../../README path0/README &&
44 git-add path0/README &&
45 git-commit -m add2 -a'
47 test_expect_success \
48 'moving whole subdirectory' \
49 'git-mv path0 path2'
51 test_expect_success \
52 'commiting the change' \
53 'git-commit -m dir-move -a'
55 test_expect_success \
56 'checking the commit' \
57 'git-diff-tree -r -M --name-status HEAD^ HEAD | \
58 grep -E "^R100.+path0/COPYING.+path2/COPYING" &&
59 git-diff-tree -r -M --name-status HEAD^ HEAD | \
60 grep -E "^R100.+path0/README.+path2/README"'
62 test_expect_success \
63 'moving whole subdirectory into subdirectory' \
64 'git-mv path2 path1'
66 test_expect_success \
67 'commiting the change' \
68 'git-commit -m dir-move -a'
70 test_expect_success \
71 'checking the commit' \
72 'git-diff-tree -r -M --name-status HEAD^ HEAD | \
73 grep -E "^R100.+path2/COPYING.+path1/path2/COPYING" &&
74 git-diff-tree -r -M --name-status HEAD^ HEAD | \
75 grep -E "^R100.+path2/README.+path1/path2/README"'
77 test_expect_failure \
78 'do not move directory over existing directory' \
79 'mkdir path0 && mkdir path0/path2 && git-mv path2 path0'
81 test_done