d2ec550af6c749ed6f41c89ca9f4c238e227034d
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 "^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 "^R100..*path1/COPYING..*path0/COPYING"'
41 test_expect_success \
42 'checking -k on non-existing file' \
43 'git mv -k idontexist path0'
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'
52 test_expect_success \
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 &&
58 test ! -f path0/untracked1 &&
59 test ! -f path0/untracked2'
61 test_expect_success \
62 'checking -f on untracked file with existing target' \
63 'touch path0/untracked1 &&
64 git mv -f untracked1 path0
65 test ! -f .git/index.lock &&
66 test -f untracked1 &&
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 \
72 .git/index.lock
74 test_expect_success \
75 'adding another file' \
76 'cp ../../README path0/README &&
77 git add path0/README &&
78 git commit -m add2 -a'
80 test_expect_success \
81 'moving whole subdirectory' \
82 'git mv path0 path2'
84 test_expect_success \
85 'commiting the change' \
86 'git commit -m dir-move -a'
88 test_expect_success \
89 'checking the commit' \
90 'git diff-tree -r -M --name-status HEAD^ HEAD | \
91 grep "^R100..*path0/COPYING..*path2/COPYING" &&
92 git diff-tree -r -M --name-status HEAD^ HEAD | \
93 grep "^R100..*path0/README..*path2/README"'
95 test_expect_success \
96 'succeed when source is a prefix of destination' \
97 'git mv path2/COPYING path2/COPYING-renamed'
99 test_expect_success \
100 'moving whole subdirectory into subdirectory' \
101 'git mv path2 path1'
103 test_expect_success \
104 'commiting the change' \
105 'git commit -m dir-move -a'
107 test_expect_success \
108 'checking the commit' \
109 'git diff-tree -r -M --name-status HEAD^ HEAD | \
110 grep "^R100..*path2/COPYING..*path1/path2/COPYING" &&
111 git diff-tree -r -M --name-status HEAD^ HEAD | \
112 grep "^R100..*path2/README..*path1/path2/README"'
114 test_expect_success \
115 'do not move directory over existing directory' \
116 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
118 test_expect_success \
119 'move into "."' \
120 'git mv path1/path2/ .'
122 test_expect_success "Michael Cassar's test case" '
123 rm -fr .git papers partA &&
124 git init &&
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` &&
132 git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
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 '
141 rm -fr papers partA path?
143 test_expect_success "Sergey Vlasov's test case" '
144 rm -fr .git &&
145 git init &&
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 '
154 test_expect_success 'absolute pathname' '(
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 &&
165 git mv sub "$(pwd)/in" &&
166 ! test -d sub &&
167 test -d in &&
168 git ls-files --error-unmatch in/file
171 )'
173 test_expect_success 'absolute pathname outside should fail' '(
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 &&
185 test_must_fail git mv sub "$out/out" &&
186 test -d sub &&
187 ! test -d ../in &&
188 git ls-files --error-unmatch sub/file
190 )'
192 test_expect_success 'git mv should not change sha1 of moved cache entry' '
194 rm -fr .git &&
195 git init &&
196 echo 1 >dirty &&
197 git add dirty &&
198 entry="$(git ls-files --stage dirty | cut -f 1)"
199 git mv dirty dirty2 &&
200 [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
201 echo 2 >dirty2 &&
202 git mv dirty2 dirty &&
203 [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
205 '
207 rm -f dirty dirty2
209 test_expect_success 'git mv should overwrite symlink to a file' '
211 rm -fr .git &&
212 git init &&
213 echo 1 >moved &&
214 ln -s moved symlink &&
215 git add moved symlink &&
216 test_must_fail git mv moved symlink &&
217 git mv -f moved symlink &&
218 ! test -e moved &&
219 test -f symlink &&
220 test "$(cat symlink)" = 1 &&
221 git update-index --refresh &&
222 git diff-files --quiet
224 '
226 rm -f moved symlink
228 test_expect_success 'git mv should overwrite file with a symlink' '
230 rm -fr .git &&
231 git init &&
232 echo 1 >moved &&
233 ln -s moved symlink &&
234 git add moved symlink &&
235 test_must_fail git mv symlink moved &&
236 git mv -f symlink moved &&
237 ! test -e symlink &&
238 test -h moved &&
239 git update-index --refresh &&
240 git diff-files --quiet
242 '
244 rm -f moved symlink
246 test_done