3 c4296144 2019-05-09 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 c4296144 2019-05-09 stsp # Permission to use, copy, modify, and distribute this software for any
6 c4296144 2019-05-09 stsp # purpose with or without fee is hereby granted, provided that the above
7 c4296144 2019-05-09 stsp # copyright notice and this permission notice appear in all copies.
9 c4296144 2019-05-09 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 c4296144 2019-05-09 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 c4296144 2019-05-09 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 c4296144 2019-05-09 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 c4296144 2019-05-09 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 c4296144 2019-05-09 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 c4296144 2019-05-09 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 c4296144 2019-05-09 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_commit_basic() {
20 c4296144 2019-05-09 stsp local testroot=`test_init commit_basic`
22 c4296144 2019-05-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
24 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
25 c4296144 2019-05-09 stsp test_done "$testroot" "$ret"
29 c4296144 2019-05-09 stsp echo "modified alpha" > $testroot/wt/alpha
30 c4296144 2019-05-09 stsp (cd $testroot/wt && got rm beta >/dev/null)
31 c4296144 2019-05-09 stsp echo "new file" > $testroot/wt/new
32 c4296144 2019-05-09 stsp (cd $testroot/wt && got add new >/dev/null)
34 83a7ae6d 2019-05-10 stsp (cd $testroot/wt && got commit -m 'test commit_basic' > $testroot/stdout)
36 c4296144 2019-05-09 stsp local head_rev=`git_show_head $testroot/repo`
37 afa376bf 2019-05-09 stsp echo "A new" > $testroot/stdout.expected
38 afa376bf 2019-05-09 stsp echo "M alpha" >> $testroot/stdout.expected
39 afa376bf 2019-05-09 stsp echo "D beta" >> $testroot/stdout.expected
40 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
42 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
44 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
45 c4296144 2019-05-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
47 c4296144 2019-05-09 stsp test_done "$testroot" "$ret"
50 f6cae3ed 2020-09-13 naddy test_commit_new_subdir() {
51 baa7dcfa 2019-05-09 stsp local testroot=`test_init commit_new_subdir`
53 baa7dcfa 2019-05-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
55 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
56 baa7dcfa 2019-05-09 stsp test_done "$testroot" "$ret"
60 baa7dcfa 2019-05-09 stsp mkdir -p $testroot/wt/d
61 baa7dcfa 2019-05-09 stsp echo "new file" > $testroot/wt/d/new
62 baa7dcfa 2019-05-09 stsp echo "another new file" > $testroot/wt/d/new2
63 baa7dcfa 2019-05-09 stsp (cd $testroot/wt && got add d/new >/dev/null)
64 baa7dcfa 2019-05-09 stsp (cd $testroot/wt && got add d/new2 >/dev/null)
66 baa7dcfa 2019-05-09 stsp (cd $testroot/wt && \
67 baa7dcfa 2019-05-09 stsp got commit -m 'test commit_new_subdir' > $testroot/stdout)
69 baa7dcfa 2019-05-09 stsp local head_rev=`git_show_head $testroot/repo`
70 baa7dcfa 2019-05-09 stsp echo "A d/new" > $testroot/stdout.expected
71 baa7dcfa 2019-05-09 stsp echo "A d/new2" >> $testroot/stdout.expected
72 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
74 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
76 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
77 baa7dcfa 2019-05-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
79 baa7dcfa 2019-05-09 stsp test_done "$testroot" "$ret"
82 f6cae3ed 2020-09-13 naddy test_commit_subdir() {
83 bc70eb79 2019-05-09 stsp local testroot=`test_init commit_subdir`
85 bc70eb79 2019-05-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
87 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
88 bc70eb79 2019-05-09 stsp test_done "$testroot" "$ret"
92 bc70eb79 2019-05-09 stsp echo "modified alpha" > $testroot/wt/alpha
93 bc70eb79 2019-05-09 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
95 bc70eb79 2019-05-09 stsp (cd $testroot/wt && \
96 bc70eb79 2019-05-09 stsp got commit -m 'test commit_subdir' epsilon > $testroot/stdout)
98 bc70eb79 2019-05-09 stsp local head_rev=`git_show_head $testroot/repo`
99 bc70eb79 2019-05-09 stsp echo "M epsilon/zeta" >> $testroot/stdout.expected
100 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
102 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
104 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
105 bc70eb79 2019-05-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
107 bc70eb79 2019-05-09 stsp test_done "$testroot" "$ret"
110 f6cae3ed 2020-09-13 naddy test_commit_single_file() {
111 5bbcb68b 2019-05-09 stsp local testroot=`test_init commit_single_file`
113 5bbcb68b 2019-05-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
115 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
116 5bbcb68b 2019-05-09 stsp test_done "$testroot" "$ret"
120 5bbcb68b 2019-05-09 stsp echo "modified alpha" > $testroot/wt/alpha
121 5bbcb68b 2019-05-09 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
123 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m 'changed zeta' epsilon/zeta \
124 5bbcb68b 2019-05-09 stsp > $testroot/stdout)
126 5bbcb68b 2019-05-09 stsp local head_rev=`git_show_head $testroot/repo`
127 5bbcb68b 2019-05-09 stsp echo "M epsilon/zeta" >> $testroot/stdout.expected
128 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
130 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
132 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
133 5bbcb68b 2019-05-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
135 5bbcb68b 2019-05-09 stsp test_done "$testroot" "$ret"
138 f6cae3ed 2020-09-13 naddy test_commit_out_of_date() {
139 819f385b 2019-05-10 stsp local testroot=`test_init commit_out_of_date`
140 f0b75401 2019-08-03 stsp local first_commit=`git_show_head $testroot/repo`
142 819f385b 2019-05-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
144 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
145 819f385b 2019-05-10 stsp test_done "$testroot" "$ret"
149 819f385b 2019-05-10 stsp echo "modified alpha" > $testroot/repo/alpha
150 819f385b 2019-05-10 stsp git_commit $testroot/repo -m "modified alpha"
152 819f385b 2019-05-10 stsp echo "modified alpha" > $testroot/wt/alpha
154 819f385b 2019-05-10 stsp (cd $testroot/wt && got commit -m 'test commit_out_of_date' \
155 819f385b 2019-05-10 stsp > $testroot/stdout 2> $testroot/stderr)
157 819f385b 2019-05-10 stsp echo -n > $testroot/stdout.expected
158 819f385b 2019-05-10 stsp echo "got: work tree must be updated before these" \
159 819f385b 2019-05-10 stsp "changes can be committed" > $testroot/stderr.expected
161 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
163 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
164 819f385b 2019-05-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
165 819f385b 2019-05-10 stsp test_done "$testroot" "$ret"
169 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
171 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
172 819f385b 2019-05-10 stsp diff -u $testroot/stderr.expected $testroot/stderr
173 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
177 f0b75401 2019-08-03 stsp echo "alpha" > $testroot/repo/alpha
178 f0b75401 2019-08-03 stsp git_commit $testroot/repo -m "reset alpha contents"
179 f0b75401 2019-08-03 stsp (cd $testroot/wt && got update -c $first_commit > /dev/null)
181 f0b75401 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
183 f0b75401 2019-08-03 stsp (cd $testroot/wt && got commit -m 'changed alpha ' > $testroot/stdout)
185 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
186 f0b75401 2019-08-03 stsp echo "commit failed unexpectedly" >&2
187 f0b75401 2019-08-03 stsp test_done "$testroot" "1"
191 f0b75401 2019-08-03 stsp local head_rev=`git_show_head $testroot/repo`
192 f0b75401 2019-08-03 stsp echo "M alpha" > $testroot/stdout.expected
193 f0b75401 2019-08-03 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
194 f0b75401 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
196 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
197 f0b75401 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
199 819f385b 2019-05-10 stsp test_done "$testroot" "$ret"
202 f6cae3ed 2020-09-13 naddy test_commit_added_subdirs() {
203 8ba6ba2d 2019-05-14 stsp local testroot=`test_init commit_added_subdirs`
205 8ba6ba2d 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
207 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
208 8ba6ba2d 2019-05-14 stsp test_done "$testroot" "$ret"
212 8ba6ba2d 2019-05-14 stsp mkdir -p $testroot/wt/d
213 8ba6ba2d 2019-05-14 stsp echo "new file" > $testroot/wt/d/new
214 8ba6ba2d 2019-05-14 stsp echo "new file 2" > $testroot/wt/d/new2
215 8ba6ba2d 2019-05-14 stsp mkdir -p $testroot/wt/d/f
216 8ba6ba2d 2019-05-14 stsp echo "new file 3" > $testroot/wt/d/f/new3
217 8ba6ba2d 2019-05-14 stsp mkdir -p $testroot/wt/d/f/g
218 8ba6ba2d 2019-05-14 stsp echo "new file 4" > $testroot/wt/d/f/g/new4
220 8ba6ba2d 2019-05-14 stsp (cd $testroot/wt && got add $testroot/wt/*/new* \
221 8ba6ba2d 2019-05-14 stsp $testroot/wt/*/*/new* $testroot/wt/*/*/*/new* > /dev/null)
223 8ba6ba2d 2019-05-14 stsp (cd $testroot/wt && got commit -m 'test commit_added_subdirs' \
224 8ba6ba2d 2019-05-14 stsp > $testroot/stdout 2> $testroot/stderr)
226 8ba6ba2d 2019-05-14 stsp local head_rev=`git_show_head $testroot/repo`
227 a3df2849 2019-05-20 stsp echo "A d/f/g/new4" > $testroot/stdout.expected
228 a3df2849 2019-05-20 stsp echo "A d/f/new3" >> $testroot/stdout.expected
229 8ba6ba2d 2019-05-14 stsp echo "A d/new" >> $testroot/stdout.expected
230 8ba6ba2d 2019-05-14 stsp echo "A d/new2" >> $testroot/stdout.expected
231 ba580f68 2020-03-22 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
233 ba580f68 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
235 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
236 ba580f68 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
238 ba580f68 2020-03-22 stsp test_done "$testroot" "$ret"
241 f6cae3ed 2020-09-13 naddy test_commit_deleted_subdirs() {
242 ba580f68 2020-03-22 stsp local testroot=`test_init commit_deleted_subdirs`
244 ba580f68 2020-03-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
246 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
247 ba580f68 2020-03-22 stsp test_done "$testroot" "$ret"
251 c8c7d149 2020-09-17 naddy (cd $testroot/wt && \
252 c8c7d149 2020-09-17 naddy got rm -R $testroot/wt/epsilon $testroot/wt/gamma >/dev/null)
254 ba580f68 2020-03-22 stsp (cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \
255 ba580f68 2020-03-22 stsp > $testroot/stdout 2> $testroot/stderr)
257 ba580f68 2020-03-22 stsp local head_rev=`git_show_head $testroot/repo`
258 ba580f68 2020-03-22 stsp echo "D epsilon/zeta" > $testroot/stdout.expected
259 ba580f68 2020-03-22 stsp echo "D gamma/delta" >> $testroot/stdout.expected
260 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
262 ba580f68 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
264 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
265 ba580f68 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
266 ba580f68 2020-03-22 stsp test_done "$testroot" "$ret"
270 ba580f68 2020-03-22 stsp got tree -r $testroot/repo > $testroot/stdout
272 ba580f68 2020-03-22 stsp echo "alpha" > $testroot/stdout.expected
273 ba580f68 2020-03-22 stsp echo "beta" >> $testroot/stdout.expected
275 8ba6ba2d 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
277 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
278 a3df2849 2019-05-20 stsp diff -u $testroot/stdout.expected $testroot/stdout
280 8ba6ba2d 2019-05-14 stsp test_done "$testroot" "$ret"
283 f6cae3ed 2020-09-13 naddy test_commit_rejects_conflicted_file() {
284 461aee03 2019-06-29 stsp local testroot=`test_init commit_rejects_conflicted_file`
286 f363d663 2019-05-23 stsp local initial_rev=`git_show_head $testroot/repo`
288 f363d663 2019-05-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
290 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
291 f363d663 2019-05-23 stsp test_done "$testroot" "$ret"
295 f363d663 2019-05-23 stsp echo "modified alpha" > $testroot/wt/alpha
296 f363d663 2019-05-23 stsp (cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
298 f363d663 2019-05-23 stsp (cd $testroot/wt && got update -c $initial_rev > /dev/null)
300 f363d663 2019-05-23 stsp echo "modified alpha, too" > $testroot/wt/alpha
302 f363d663 2019-05-23 stsp echo "C alpha" > $testroot/stdout.expected
303 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
304 f363d663 2019-05-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
305 f363d663 2019-05-23 stsp echo >> $testroot/stdout.expected
306 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
308 f363d663 2019-05-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
310 f363d663 2019-05-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
312 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
313 f363d663 2019-05-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
314 f363d663 2019-05-23 stsp test_done "$testroot" "$ret"
318 f363d663 2019-05-23 stsp (cd $testroot/wt && got commit -m 'commit it' > $testroot/stdout \
319 f363d663 2019-05-23 stsp 2> $testroot/stderr)
321 f363d663 2019-05-23 stsp echo -n > $testroot/stdout.expected
322 f363d663 2019-05-23 stsp echo "got: cannot commit file in conflicted status" \
323 f363d663 2019-05-23 stsp > $testroot/stderr.expected
325 f363d663 2019-05-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
327 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
328 f363d663 2019-05-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
329 f363d663 2019-05-23 stsp test_done "$testroot" "$ret"
332 f363d663 2019-05-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
334 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
335 f363d663 2019-05-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
337 f363d663 2019-05-23 stsp test_done "$testroot" "$ret"
340 f6cae3ed 2020-09-13 naddy test_commit_single_file_multiple() {
341 1a36436d 2019-06-10 stsp local testroot=`test_init commit_single_file_multiple`
343 1a36436d 2019-06-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
345 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
346 1a36436d 2019-06-10 stsp test_done "$testroot" "$ret"
350 1a36436d 2019-06-10 stsp for i in 1 2 3 4; do
351 1a36436d 2019-06-10 stsp echo "modified alpha" >> $testroot/wt/alpha
353 1a36436d 2019-06-10 stsp (cd $testroot/wt && \
354 1a36436d 2019-06-10 stsp got commit -m "changed alpha" > $testroot/stdout)
356 1a36436d 2019-06-10 stsp local head_rev=`git_show_head $testroot/repo`
357 1a36436d 2019-06-10 stsp echo "M alpha" > $testroot/stdout.expected
358 1a36436d 2019-06-10 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
360 1a36436d 2019-06-10 stsp cmp -s $testroot/stdout.expected $testroot/stdout
362 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
363 1a36436d 2019-06-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
364 1a36436d 2019-06-10 stsp test_done "$testroot" "$ret"
369 1a36436d 2019-06-10 stsp test_done "$testroot" "0"
372 f6cae3ed 2020-09-13 naddy test_commit_added_and_modified_in_same_dir() {
373 4866d084 2019-07-10 stsp local testroot=`test_init commit_added_and_modified_in_same_dir`
375 4866d084 2019-07-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
377 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
378 4866d084 2019-07-10 stsp test_done "$testroot" "$ret"
382 4866d084 2019-07-10 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
383 4866d084 2019-07-10 stsp echo "new file" > $testroot/wt/epsilon/new
384 4866d084 2019-07-10 stsp (cd $testroot/wt && got add epsilon/new >/dev/null)
386 4866d084 2019-07-10 stsp (cd $testroot/wt && got commit \
387 4866d084 2019-07-10 stsp -m 'added and modified in same dir' > $testroot/stdout \
388 4866d084 2019-07-10 stsp 2> $testroot/stderr)
390 4866d084 2019-07-10 stsp local head_rev=`git_show_head $testroot/repo`
391 4866d084 2019-07-10 stsp echo "A epsilon/new" > $testroot/stdout.expected
392 4866d084 2019-07-10 stsp echo "M epsilon/zeta" >> $testroot/stdout.expected
393 4866d084 2019-07-10 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
395 e0233cea 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
397 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
398 e0233cea 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
400 e0233cea 2019-07-25 stsp test_done "$testroot" "$ret"
403 f6cae3ed 2020-09-13 naddy test_commit_path_prefix() {
404 e0233cea 2019-07-25 stsp local testroot=`test_init commit_path_prefix`
405 e0233cea 2019-07-25 stsp local commit1=`git_show_head $testroot/repo`
407 e0233cea 2019-07-25 stsp got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
409 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
410 e0233cea 2019-07-25 stsp test_done "$testroot" "$ret"
414 e0233cea 2019-07-25 stsp echo "modified delta" > $testroot/wt/delta
416 e0233cea 2019-07-25 stsp (cd $testroot/wt && got commit -m 'changed gamma/delta' > $testroot/stdout)
418 e0233cea 2019-07-25 stsp local commit2=`git_show_head $testroot/repo`
419 e0233cea 2019-07-25 stsp echo "M delta" > $testroot/stdout.expected
420 e0233cea 2019-07-25 stsp echo "Created commit $commit2" >> $testroot/stdout.expected
422 4866d084 2019-07-10 stsp cmp -s $testroot/stdout.expected $testroot/stdout
424 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
425 2b496619 2019-07-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
426 e0233cea 2019-07-25 stsp test_done "$testroot" "$ret"
430 e0233cea 2019-07-25 stsp echo "diff $commit1 $commit2" > $testroot/stdout.expected
431 9b4458b4 2022-06-26 thomas echo "commit - $commit1" >> $testroot/stdout.expected
432 9b4458b4 2022-06-26 thomas echo "commit + $commit2" >> $testroot/stdout.expected
433 e0233cea 2019-07-25 stsp echo -n 'blob - ' >> $testroot/stdout.expected
434 e0233cea 2019-07-25 stsp got tree -r $testroot/repo -c $commit1 -i gamma | grep 'delta$' \
435 e0233cea 2019-07-25 stsp | cut -d' ' -f 1 >> $testroot/stdout.expected
436 e0233cea 2019-07-25 stsp echo -n 'blob + ' >> $testroot/stdout.expected
437 e0233cea 2019-07-25 stsp got tree -r $testroot/repo -c $commit2 -i gamma | grep 'delta$' | \
438 e0233cea 2019-07-25 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
439 e0233cea 2019-07-25 stsp echo '--- gamma/delta' >> $testroot/stdout.expected
440 e0233cea 2019-07-25 stsp echo '+++ gamma/delta' >> $testroot/stdout.expected
441 e0233cea 2019-07-25 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
442 e0233cea 2019-07-25 stsp echo '-delta' >> $testroot/stdout.expected
443 e0233cea 2019-07-25 stsp echo '+modified delta' >> $testroot/stdout.expected
445 e0233cea 2019-07-25 stsp got diff -r $testroot/repo $commit1 $commit2 > $testroot/stdout
446 f2b0a8b0 2020-07-31 stsp cmp -s $testroot/stdout.expected $testroot/stdout
448 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
449 f2b0a8b0 2020-07-31 stsp diff -u $testroot/stdout.expected $testroot/stdout
450 f2b0a8b0 2020-07-31 stsp test_done "$testroot" "$ret"
454 f2b0a8b0 2020-07-31 stsp (cd $testroot/wt && got rm delta > /dev/null)
455 f2b0a8b0 2020-07-31 stsp echo new > $testroot/wt/new
456 f2b0a8b0 2020-07-31 stsp (cd $testroot/wt && got add new > /dev/null)
458 f2b0a8b0 2020-07-31 stsp (cd $testroot/wt && got commit -m 'remove gamma/delta; add gamma/new' \
459 f2b0a8b0 2020-07-31 stsp > $testroot/stdout)
461 f2b0a8b0 2020-07-31 stsp local commit3=`git_show_head $testroot/repo`
462 f2b0a8b0 2020-07-31 stsp echo "A new" > $testroot/stdout.expected
463 f2b0a8b0 2020-07-31 stsp echo "D delta" >> $testroot/stdout.expected
464 f2b0a8b0 2020-07-31 stsp echo "Created commit $commit3" >> $testroot/stdout.expected
466 f2b0a8b0 2020-07-31 stsp cmp -s $testroot/stdout.expected $testroot/stdout
468 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
469 f2b0a8b0 2020-07-31 stsp diff -u $testroot/stdout.expected $testroot/stdout
470 f2b0a8b0 2020-07-31 stsp test_done "$testroot" "$ret"
474 f2b0a8b0 2020-07-31 stsp echo "diff $commit2 $commit3" > $testroot/stdout.expected
475 9b4458b4 2022-06-26 thomas echo "commit - $commit2" >> $testroot/stdout.expected
476 9b4458b4 2022-06-26 thomas echo "commit + $commit3" >> $testroot/stdout.expected
477 f2b0a8b0 2020-07-31 stsp echo -n 'blob - ' >> $testroot/stdout.expected
478 f2b0a8b0 2020-07-31 stsp got tree -r $testroot/repo -c $commit2 -i gamma | grep 'delta$' \
479 f2b0a8b0 2020-07-31 stsp | cut -d' ' -f 1 | sed -e 's/$/ (mode 644)/' \
480 f2b0a8b0 2020-07-31 stsp >> $testroot/stdout.expected
481 f2b0a8b0 2020-07-31 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
482 f2b0a8b0 2020-07-31 stsp echo '--- gamma/delta' >> $testroot/stdout.expected
483 f2b0a8b0 2020-07-31 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
484 f2b0a8b0 2020-07-31 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
485 f2b0a8b0 2020-07-31 stsp echo '-modified delta' >> $testroot/stdout.expected
486 f2b0a8b0 2020-07-31 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
487 f2b0a8b0 2020-07-31 stsp echo -n 'blob + ' >> $testroot/stdout.expected
488 f2b0a8b0 2020-07-31 stsp got tree -r $testroot/repo -c $commit3 -i gamma | grep 'new$' | \
489 f2b0a8b0 2020-07-31 stsp cut -d' ' -f 1 | sed -e 's/$/ (mode 644)/' \
490 f2b0a8b0 2020-07-31 stsp >> $testroot/stdout.expected
491 f2b0a8b0 2020-07-31 stsp echo '--- /dev/null' >> $testroot/stdout.expected
492 f2b0a8b0 2020-07-31 stsp echo '+++ gamma/new' >> $testroot/stdout.expected
493 f2b0a8b0 2020-07-31 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
494 f2b0a8b0 2020-07-31 stsp echo '+new' >> $testroot/stdout.expected
496 f2b0a8b0 2020-07-31 stsp got diff -r $testroot/repo $commit2 $commit3 > $testroot/stdout
497 e0233cea 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
499 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
500 e0233cea 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
502 4866d084 2019-07-10 stsp test_done "$testroot" "$ret"
503 f2b0a8b0 2020-07-31 stsp return "$ret"
506 f6cae3ed 2020-09-13 naddy test_commit_dir_path() {
507 90e8619e 2019-07-25 stsp local testroot=`test_init commit_dir_path`
509 90e8619e 2019-07-25 stsp got checkout $testroot/repo $testroot/wt > /dev/null
511 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
512 90e8619e 2019-07-25 stsp test_done "$testroot" "$ret"
516 90e8619e 2019-07-25 stsp echo "modified alpha" > $testroot/wt/alpha
517 90e8619e 2019-07-25 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
519 90e8619e 2019-07-25 stsp (cd $testroot/wt && got commit -m 'changed zeta' epsilon \
520 90e8619e 2019-07-25 stsp > $testroot/stdout)
522 90e8619e 2019-07-25 stsp local head_rev=`git_show_head $testroot/repo`
523 90e8619e 2019-07-25 stsp echo "M epsilon/zeta" >> $testroot/stdout.expected
524 90e8619e 2019-07-25 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
526 90e8619e 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
528 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
529 90e8619e 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
530 90e8619e 2019-07-25 stsp test_done "$testroot" "$ret"
534 90e8619e 2019-07-25 stsp echo "M alpha" > $testroot/stdout.expected
535 90e8619e 2019-07-25 stsp (cd $testroot/wt && got status > $testroot/stdout)
536 90e8619e 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
538 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
539 90e8619e 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
541 90e8619e 2019-07-25 stsp test_done "$testroot" "$ret"
544 f6cae3ed 2020-09-13 naddy test_commit_selected_paths() {
545 5c1e53bc 2019-07-28 stsp local testroot=`test_init commit_selected_paths`
547 5c1e53bc 2019-07-28 stsp got checkout $testroot/repo $testroot/wt > /dev/null
549 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
550 5c1e53bc 2019-07-28 stsp test_done "$testroot" "$ret"
554 5c1e53bc 2019-07-28 stsp echo "modified alpha" > $testroot/wt/alpha
555 5c1e53bc 2019-07-28 stsp echo "modified delta" > $testroot/wt/gamma/delta
556 5c1e53bc 2019-07-28 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
557 5c1e53bc 2019-07-28 stsp (cd $testroot/wt && got rm beta >/dev/null)
558 5c1e53bc 2019-07-28 stsp echo "new file" > $testroot/wt/new
559 5c1e53bc 2019-07-28 stsp (cd $testroot/wt && got add new >/dev/null)
561 5c1e53bc 2019-07-28 stsp (cd $testroot/wt && got commit -m 'many paths' nonexistent alpha \
562 5c1e53bc 2019-07-28 stsp > $testroot/stdout 2> $testroot/stderr)
564 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
565 5c1e53bc 2019-07-28 stsp echo "commit succeeded unexpectedly" >&2
566 5c1e53bc 2019-07-28 stsp test_done "$testroot" "1"
569 5c1e53bc 2019-07-28 stsp echo "got: nonexistent: bad path" > $testroot/stderr.expected
571 5c1e53bc 2019-07-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
573 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
574 5c1e53bc 2019-07-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
575 5c1e53bc 2019-07-28 stsp test_done "$testroot" "$ret"
579 5c1e53bc 2019-07-28 stsp (cd $testroot/wt && got commit -m 'many paths' \
580 5c1e53bc 2019-07-28 stsp beta new gamma > $testroot/stdout)
582 5c1e53bc 2019-07-28 stsp local head_rev=`git_show_head $testroot/repo`
583 5c1e53bc 2019-07-28 stsp echo "A new" > $testroot/stdout.expected
584 5c1e53bc 2019-07-28 stsp echo "D beta" >> $testroot/stdout.expected
585 5c1e53bc 2019-07-28 stsp echo "M gamma/delta" >> $testroot/stdout.expected
586 5c1e53bc 2019-07-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
588 5c1e53bc 2019-07-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
590 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
591 5c1e53bc 2019-07-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
593 5c1e53bc 2019-07-28 stsp test_done "$testroot" "$ret"
596 f6cae3ed 2020-09-13 naddy test_commit_outside_refs_heads() {
597 916f288c 2019-07-30 stsp local testroot=`test_init commit_outside_refs_heads`
599 e31abbf2 2020-03-22 stsp got ref -r $testroot/repo -c master refs/remotes/origin/master
601 916f288c 2019-07-30 stsp got checkout -b refs/remotes/origin/master \
602 916f288c 2019-07-30 stsp $testroot/repo $testroot/wt > /dev/null
604 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
605 916f288c 2019-07-30 stsp test_done "$testroot" "$ret"
609 916f288c 2019-07-30 stsp echo "modified alpha" > $testroot/wt/alpha
611 916f288c 2019-07-30 stsp (cd $testroot/wt && got commit -m 'change alpha' \
612 916f288c 2019-07-30 stsp > $testroot/stdout 2> $testroot/stderr)
614 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
615 916f288c 2019-07-30 stsp echo "commit succeeded unexpectedly" >&2
616 916f288c 2019-07-30 stsp test_done "$testroot" "1"
620 916f288c 2019-07-30 stsp echo -n > $testroot/stdout.expected
621 916f288c 2019-07-30 stsp cmp -s $testroot/stdout.expected $testroot/stdout
623 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
624 916f288c 2019-07-30 stsp diff -u $testroot/stdout.expected $testroot/stdout
625 916f288c 2019-07-30 stsp test_done "$testroot" "$ret"
629 916f288c 2019-07-30 stsp echo -n "got: will not commit to a branch outside the " \
630 916f288c 2019-07-30 stsp > $testroot/stderr.expected
631 916f288c 2019-07-30 stsp echo '"refs/heads/" reference namespace' \
632 916f288c 2019-07-30 stsp >> $testroot/stderr.expected
633 916f288c 2019-07-30 stsp cmp -s $testroot/stderr.expected $testroot/stderr
635 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
636 916f288c 2019-07-30 stsp diff -u $testroot/stderr.expected $testroot/stderr
638 916f288c 2019-07-30 stsp test_done "$testroot" "$ret"
641 f6cae3ed 2020-09-13 naddy test_commit_no_email() {
642 84792843 2019-08-09 stsp local testroot=`test_init commit_no_email`
644 84792843 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
646 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
647 84792843 2019-08-09 stsp test_done "$testroot" "$ret"
651 84792843 2019-08-09 stsp echo "modified alpha" > $testroot/wt/alpha
652 84792843 2019-08-09 stsp (cd $testroot/wt && env GOT_AUTHOR=":flan_hacker:" \
653 84792843 2019-08-09 stsp got commit -m 'test no email' > $testroot/stdout \
654 84792843 2019-08-09 stsp 2> $testroot/stderr)
656 17431c13 2022-02-12 thomas echo -n "got: :flan_hacker:: commit author's email address " \
657 84792843 2019-08-09 stsp > $testroot/stderr.expected
658 17431c13 2022-02-12 thomas echo "is required for compatibility with Git" \
659 84792843 2019-08-09 stsp >> $testroot/stderr.expected
660 84792843 2019-08-09 stsp cmp -s $testroot/stderr.expected $testroot/stderr
662 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
663 84792843 2019-08-09 stsp diff -u $testroot/stderr.expected $testroot/stderr
664 84792843 2019-08-09 stsp test_done "$testroot" "$ret"
668 84792843 2019-08-09 stsp echo -n > $testroot/stdout.expected
669 84792843 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
671 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
672 84792843 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
674 84792843 2019-08-09 stsp test_done "$testroot" "$ret"
677 f6cae3ed 2020-09-13 naddy test_commit_tree_entry_sorting() {
678 6af1ccbd 2019-08-16 stsp local testroot=`test_init commit_tree_entry_sorting`
680 6af1ccbd 2019-08-16 stsp got checkout $testroot/repo $testroot/wt > /dev/null
682 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
683 6af1ccbd 2019-08-16 stsp test_done "$testroot" "$ret"
687 6af1ccbd 2019-08-16 stsp # Git's index gets corrupted when tree entries are written in the
688 6af1ccbd 2019-08-16 stsp # order defined by got_path_cmp() rather than Git's own ordering.
689 6af1ccbd 2019-08-16 stsp # Create a new tree where a directory "got" and a file "got-version"
690 6af1ccbd 2019-08-16 stsp # would sort in the wrong order according to Git's opinion.
691 6af1ccbd 2019-08-16 stsp mkdir $testroot/wt/got
692 6af1ccbd 2019-08-16 stsp touch $testroot/wt/got/foo
693 6af1ccbd 2019-08-16 stsp echo foo > $testroot/wt/got-version
694 6af1ccbd 2019-08-16 stsp echo zzz > $testroot/wt/zzz
695 6af1ccbd 2019-08-16 stsp (cd $testroot/wt && got add got-version got/foo zzz > /dev/null)
697 6af1ccbd 2019-08-16 stsp (cd $testroot/wt && got commit -m 'test' > /dev/null)
699 6af1ccbd 2019-08-16 stsp # Let git-fsck verify the newly written tree to make sure Git is happy
700 6af1ccbd 2019-08-16 stsp (cd $testroot/repo && git fsck --strict \
701 6af1ccbd 2019-08-16 stsp > $testroot/fsck.stdout 2> $testroot/fsck.stderr)
703 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
706 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_author() {
707 257add31 2020-09-09 stsp local testroot=`test_init commit_gotconfig_author`
709 257add31 2020-09-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
711 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
712 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
715 257add31 2020-09-09 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
716 257add31 2020-09-09 stsp > $testroot/repo/.git/got.conf
718 257add31 2020-09-09 stsp echo "modified alpha" > $testroot/wt/alpha
719 257add31 2020-09-09 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
721 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
722 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
726 257add31 2020-09-09 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
728 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
729 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
733 257add31 2020-09-09 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
734 50b0790e 2020-09-11 stsp > $testroot/stdout.expected
735 50b0790e 2020-09-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
737 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
738 50b0790e 2020-09-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
740 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
743 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_worktree_author() {
744 50b0790e 2020-09-11 stsp local testroot=`test_init commit_gotconfig_worktree_author`
746 50b0790e 2020-09-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
748 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
749 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
752 50b0790e 2020-09-11 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
753 50b0790e 2020-09-11 stsp > $testroot/repo/.git/got.conf
754 50b0790e 2020-09-11 stsp echo 'author "Flan Squee <flan_squee@openbsd.org>"' \
755 50b0790e 2020-09-11 stsp > $testroot/wt/.got/got.conf
757 50b0790e 2020-09-11 stsp echo "modified alpha" > $testroot/wt/alpha
758 50b0790e 2020-09-11 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
760 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
761 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
765 50b0790e 2020-09-11 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
767 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
768 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
772 50b0790e 2020-09-11 stsp echo "from: Flan Squee <flan_squee@openbsd.org>" \
773 257add31 2020-09-09 stsp > $testroot/stdout.expected
774 257add31 2020-09-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
776 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
777 257add31 2020-09-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
779 6af1ccbd 2019-08-16 stsp test_done "$testroot" "$ret"
782 f6cae3ed 2020-09-13 naddy test_commit_gitconfig_author() {
783 aba9c984 2019-09-08 stsp local testroot=`test_init commit_gitconfig_author`
785 aba9c984 2019-09-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
787 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
788 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
792 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.name 'Flan Luck')
793 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
795 aba9c984 2019-09-08 stsp echo "modified alpha" > $testroot/wt/alpha
796 aba9c984 2019-09-08 stsp (cd $testroot/wt && got commit -m 'test gitconfig author' > /dev/null)
798 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
799 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
803 aba9c984 2019-09-08 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
805 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
806 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
810 aba9c984 2019-09-08 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
811 aba9c984 2019-09-08 stsp > $testroot/stdout.expected
812 aba9c984 2019-09-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
814 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
815 aba9c984 2019-09-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
817 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
820 f6cae3ed 2020-09-13 naddy test_commit_xbit_change() {
821 1ebedb77 2019-10-19 stsp local testroot=`test_init commit_xbit_change`
823 1ebedb77 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > /dev/null
825 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
826 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
830 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
832 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
833 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
835 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
837 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
838 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
839 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
843 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
845 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
846 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
847 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
851 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
852 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
853 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
854 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
856 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
857 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
858 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
862 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
864 1ebedb77 2019-10-19 stsp echo -n > $testroot/stdout.expected
865 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
867 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
868 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
869 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
873 1ebedb77 2019-10-19 stsp chmod -x $testroot/wt/alpha
875 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
876 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
878 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
880 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
881 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
882 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
886 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
888 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
889 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
890 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
894 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
895 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
896 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
897 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
899 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
900 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
901 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
905 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
907 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
908 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
910 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
912 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
913 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
915 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
918 f6cae3ed 2020-09-13 naddy commit_check_mode() {
919 f7b97ccb 2020-04-14 stsp local mode="$1"
920 f7b97ccb 2020-04-14 stsp local expected_mode="$2"
922 f7b97ccb 2020-04-14 stsp chmod 644 $testroot/wt/alpha
923 f7b97ccb 2020-04-14 stsp echo a >> $testroot/wt/alpha
924 f7b97ccb 2020-04-14 stsp chmod $mode $testroot/wt/alpha
926 f7b97ccb 2020-04-14 stsp (cd $testroot/wt && got commit -mm > $testroot/stdout)
928 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
929 f7b97ccb 2020-04-14 stsp echo "got commit failed unexpectedly"
930 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
934 f7b97ccb 2020-04-14 stsp local commit_id=`git_show_head $testroot/repo`
935 f7b97ccb 2020-04-14 stsp echo 'M alpha' > $testroot/stdout.expected
936 f7b97ccb 2020-04-14 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
937 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
939 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
940 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
941 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
945 f7b97ccb 2020-04-14 stsp local tree_id=$(got cat -r $testroot/repo $commit_id | \
946 f7b97ccb 2020-04-14 stsp grep ^tree | cut -d' ' -f2)
947 f7b97ccb 2020-04-14 stsp local alpha_id=$(got cat -r $testroot/repo $tree_id | \
948 f7b97ccb 2020-04-14 stsp grep 'alpha$' | cut -d' ' -f1)
949 f7b97ccb 2020-04-14 stsp echo "$alpha_id $expected_mode alpha" > $testroot/stdout.expected
950 f7b97ccb 2020-04-14 stsp got cat -r $testroot/repo $tree_id | grep 'alpha$' > $testroot/stdout
951 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
953 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
954 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
956 f7b97ccb 2020-04-14 stsp return $ret
959 f6cae3ed 2020-09-13 naddy test_commit_normalizes_filemodes() {
960 f7b97ccb 2020-04-14 stsp local testroot=`test_init commit_normalizes_filemodes`
962 f7b97ccb 2020-04-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
964 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
965 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
969 f7b97ccb 2020-04-14 stsp modes="600 400 460 640 440 660 444 666"
970 f7b97ccb 2020-04-14 stsp for m in $modes; do
971 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100644"
973 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
977 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
978 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
981 f7b97ccb 2020-04-14 stsp modes="700 500 570 750 550 770 555 777"
982 f7b97ccb 2020-04-14 stsp for m in $modes; do
983 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100755"
985 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
989 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
990 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
993 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
996 f6cae3ed 2020-09-13 naddy test_commit_with_unrelated_submodule() {
997 e7303626 2020-05-14 stsp local testroot=`test_init commit_with_unrelated_submodule`
999 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1001 e7303626 2020-05-14 stsp (cd $testroot/repo && git submodule -q add ../repo2)
1002 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1004 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1006 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1007 7aadece8 2020-05-17 stsp echo "checkout failed unexpectedly" >&2
1008 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1012 e7303626 2020-05-14 stsp echo "modified alpha" > $testroot/wt/alpha
1014 7aadece8 2020-05-17 stsp echo "" > $testroot/stdout.expected
1016 74ad335c 2020-06-23 stsp (cd $testroot/wt && got commit -m 'modify alpha' > $testroot/stdout)
1018 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1019 7aadece8 2020-05-17 stsp echo "commit failed unexpectedly" >&2
1020 7aadece8 2020-05-17 stsp test_done "$testroot" "$ret"
1024 7aadece8 2020-05-17 stsp local head_rev=`git_show_head $testroot/repo`
1025 7aadece8 2020-05-17 stsp echo "M alpha" > $testroot/stdout.expected
1026 7aadece8 2020-05-17 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1028 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1030 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1031 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1033 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1036 f6cae3ed 2020-09-13 naddy check_symlinks() {
1037 bd6aa359 2020-07-23 stsp local wtpath="$1"
1038 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/alpha.link ]; then
1039 bd6aa359 2020-07-23 stsp echo "alpha.link is not a symlink"
1043 bd6aa359 2020-07-23 stsp readlink $wtpath/alpha.link > $testroot/stdout
1044 bd6aa359 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1045 bd6aa359 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1047 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1048 bd6aa359 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1052 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/epsilon.link ]; then
1053 bd6aa359 2020-07-23 stsp echo "epsilon.link is not a symlink"
1057 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon.link > $testroot/stdout
1058 bd6aa359 2020-07-23 stsp echo "epsilon" > $testroot/stdout.expected
1059 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1061 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1062 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1066 bd6aa359 2020-07-23 stsp if [ -h $wtpath/passwd.link ]; then
1067 bd6aa359 2020-07-23 stsp echo -n "passwd.link is a symlink and points outside of work tree: " >&2
1068 bd6aa359 2020-07-23 stsp readlink $wtpath/passwd.link >&2
1072 bd6aa359 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
1073 bd6aa359 2020-07-23 stsp cp $wtpath/passwd.link $testroot/content
1075 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1076 bd6aa359 2020-07-23 stsp echo "cp command failed unexpectedly" >&2
1080 bd6aa359 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
1082 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1083 bd6aa359 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
1087 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon/beta.link > $testroot/stdout
1088 bd6aa359 2020-07-23 stsp echo "../beta" > $testroot/stdout.expected
1089 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1091 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1092 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1096 bd6aa359 2020-07-23 stsp readlink $wtpath/nonexistent.link > $testroot/stdout
1097 bd6aa359 2020-07-23 stsp echo "nonexistent" > $testroot/stdout.expected
1098 7aadece8 2020-05-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1100 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1101 7aadece8 2020-05-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1108 f6cae3ed 2020-09-13 naddy test_commit_symlink() {
1109 bd6aa359 2020-07-23 stsp local testroot=`test_init commit_symlink`
1111 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1113 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1114 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1118 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s alpha alpha.link)
1119 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s epsilon epsilon.link)
1120 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1121 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s ../beta epsilon/beta.link)
1122 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s nonexistent nonexistent.link)
1123 bd6aa359 2020-07-23 stsp (cd $testroot/wt && got add alpha.link epsilon.link passwd.link \
1124 bd6aa359 2020-07-23 stsp epsilon/beta.link nonexistent.link > /dev/null)
1126 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1127 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1129 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1130 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1131 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1134 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/passwd.link: " > $testroot/stderr.expected
1135 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1136 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1137 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1139 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1140 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1141 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1145 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1146 35213c7c 2020-07-23 stsp > $testroot/stdout)
1148 bd6aa359 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1149 bd6aa359 2020-07-23 stsp echo "A alpha.link" > $testroot/stdout.expected
1150 bd6aa359 2020-07-23 stsp echo "A epsilon.link" >> $testroot/stdout.expected
1151 bd6aa359 2020-07-23 stsp echo "A nonexistent.link" >> $testroot/stdout.expected
1152 bd6aa359 2020-07-23 stsp echo "A passwd.link" >> $testroot/stdout.expected
1153 bd6aa359 2020-07-23 stsp echo "A epsilon/beta.link" >> $testroot/stdout.expected
1154 bd6aa359 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1156 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1158 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1159 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1160 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1164 bd6aa359 2020-07-23 stsp # verify created in-repository tree
1165 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1167 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1168 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1171 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt2
1173 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1174 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1178 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1179 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1180 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1184 75f0a0fb 2020-07-23 stsp # 'got update' should reinstall passwd.link as a regular file
1185 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
1186 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt
1188 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1189 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1193 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
1194 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT gamma epsilon.link)
1195 88fb31d4 2020-07-23 stsp rm $testroot/wt/epsilon/beta.link
1196 88fb31d4 2020-07-23 stsp echo "this is a regular file" > $testroot/wt/epsilon/beta.link
1197 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
1198 35213c7c 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
1199 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
1200 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
1201 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf alpha new.link)
1202 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got add new.link > /dev/null)
1204 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1205 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1207 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1208 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1209 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1212 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
1213 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1214 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1215 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1217 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1218 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1219 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1223 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1224 35213c7c 2020-07-23 stsp > $testroot/stdout)
1226 88fb31d4 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1227 35213c7c 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
1228 35213c7c 2020-07-23 stsp echo "A new.link" >> $testroot/stdout.expected
1229 88fb31d4 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
1230 88fb31d4 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
1231 88fb31d4 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
1232 88fb31d4 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
1233 88fb31d4 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1235 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1237 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1238 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1239 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1243 88fb31d4 2020-07-23 stsp got tree -r $testroot/repo -c $head_rev -R > $testroot/stdout
1244 88fb31d4 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
1246 88fb31d4 2020-07-23 stsp alpha.link@ -> beta
1248 35213c7c 2020-07-23 stsp dotgotbar.link@ -> .got/bar
1250 88fb31d4 2020-07-23 stsp epsilon/beta.link
1251 88fb31d4 2020-07-23 stsp epsilon/zeta
1252 88fb31d4 2020-07-23 stsp epsilon.link@ -> gamma
1254 88fb31d4 2020-07-23 stsp gamma/delta
1255 88fb31d4 2020-07-23 stsp new.link@ -> alpha
1256 88fb31d4 2020-07-23 stsp passwd.link@ -> /etc/passwd
1258 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1260 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1261 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1263 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1266 f6cae3ed 2020-09-13 naddy test_commit_fix_bad_symlink() {
1267 5a1fbc73 2020-07-23 stsp local testroot=`test_init commit_fix_bad_symlink`
1269 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1271 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1272 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1273 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1277 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1278 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got add passwd.link > /dev/null)
1280 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'commit bad symlink' \
1281 35213c7c 2020-07-23 stsp > $testroot/stdout)
1283 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1284 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1285 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1288 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update >/dev/null)
1289 5a1fbc73 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
1290 5a1fbc73 2020-07-23 stsp echo "passwd.link is a symlink but should be a regular file" >&2
1291 5a1fbc73 2020-07-23 stsp test_done "$testroot" "1"
1295 5a1fbc73 2020-07-23 stsp # create another work tree which will contain the "bad" symlink
1296 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1298 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1299 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1300 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1304 5a1fbc73 2020-07-23 stsp # change "bad" symlink back into a "good" symlink
1305 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT alpha passwd.link)
1307 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got commit -m 'fix bad symlink' \
1308 5a1fbc73 2020-07-23 stsp > $testroot/stdout)
1310 5a1fbc73 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1311 5a1fbc73 2020-07-23 stsp echo "M passwd.link" > $testroot/stdout.expected
1312 5a1fbc73 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1314 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1316 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1317 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1318 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1322 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1323 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1324 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1328 5a1fbc73 2020-07-23 stsp readlink $testroot/wt/passwd.link > $testroot/stdout
1329 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1330 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1332 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1333 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1337 5a1fbc73 2020-07-23 stsp # Update the other work tree; the bad symlink should be fixed
1338 5a1fbc73 2020-07-23 stsp (cd $testroot/wt2 && got update > /dev/null)
1340 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1341 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1342 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1346 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt2/passwd.link ]; then
1347 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1348 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1352 5a1fbc73 2020-07-23 stsp readlink $testroot/wt2/passwd.link > $testroot/stdout
1353 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1354 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1356 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1357 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1361 bd6aa359 2020-07-23 stsp test_done "$testroot" "0"
1364 28cf319f 2021-01-28 stsp test_commit_prepared_logmsg() {
1365 28cf319f 2021-01-28 stsp local testroot=`test_init commit_prepared_logmsg`
1367 28cf319f 2021-01-28 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1369 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1370 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1374 28cf319f 2021-01-28 stsp echo "modified alpha" > $testroot/wt/alpha
1375 28cf319f 2021-01-28 stsp (cd $testroot/wt && got rm beta >/dev/null)
1376 28cf319f 2021-01-28 stsp echo "new file" > $testroot/wt/new
1377 28cf319f 2021-01-28 stsp (cd $testroot/wt && got add new >/dev/null)
1379 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg' > $testroot/logmsg
1381 28cf319f 2021-01-28 stsp cat > $testroot/editor.sh <<EOF
1383 c206b220 2021-10-09 thomas SOPTS='-i ""'
1384 c206b220 2021-10-09 thomas [ "\$OSTYPE" = "linux-gnu" ] && SOPTS="-i"
1385 c206b220 2021-10-09 thomas sed "\$SOPTS" -e 's/foo/bar/' "\$1"
1387 28cf319f 2021-01-28 stsp chmod +x $testroot/editor.sh
1389 8e09a168 2021-06-17 tracey (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1390 28cf319f 2021-01-28 stsp got commit -F "$testroot/logmsg" > $testroot/stdout)
1392 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1393 28cf319f 2021-01-28 stsp echo "A new" > $testroot/stdout.expected
1394 28cf319f 2021-01-28 stsp echo "M alpha" >> $testroot/stdout.expected
1395 28cf319f 2021-01-28 stsp echo "D beta" >> $testroot/stdout.expected
1396 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1398 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1400 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1401 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1402 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1406 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1407 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
1408 fa37079f 2021-10-09 thomas export LC_TIME=C
1409 fa37079f 2021-10-09 thomas d=`date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
1410 fa37079f 2021-10-09 thomas LC_TIME="$prev_LC_TIME"
1411 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" > $testroot/stdout.expected
1412 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1413 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1414 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1415 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1416 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg" >> $testroot/stdout.expected
1417 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1419 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1420 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1422 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1423 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1424 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1428 28cf319f 2021-01-28 stsp echo "modified alpha again" > $testroot/wt/alpha
1430 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg non-interactive' \
1431 28cf319f 2021-01-28 stsp > $testroot/logmsg
1433 28cf319f 2021-01-28 stsp (cd $testroot/wt && got commit -N -F "$testroot/logmsg" \
1434 28cf319f 2021-01-28 stsp > $testroot/stdout)
1436 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1437 28cf319f 2021-01-28 stsp echo "M alpha" > $testroot/stdout.expected
1438 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1440 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1442 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1443 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1444 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1448 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1449 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
1450 fa37079f 2021-10-09 thomas export LC_TIME=C
1451 fa37079f 2021-10-09 thomas d=`date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
1452 fa37079f 2021-10-09 thomas LC_TIME="$prev_LC_TIME"
1453 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" \
1454 28cf319f 2021-01-28 stsp > $testroot/stdout.expected
1455 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1456 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1457 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1458 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1459 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg non-interactive" \
1460 28cf319f 2021-01-28 stsp >> $testroot/stdout.expected
1461 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1463 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1464 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1466 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1467 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1469 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1472 e8f02263 2022-01-23 thomas test_commit_large_file() {
1473 e8f02263 2022-01-23 thomas local testroot=`test_init commit_large_file`
1475 e8f02263 2022-01-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1477 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1478 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1479 e8f02263 2022-01-23 thomas return 1
1482 b9e845cd 2022-07-06 thomas dd status=none if=/dev/zero of=$testroot/wt/new bs=1M count=64
1483 e8f02263 2022-01-23 thomas (cd $testroot/wt && got add new >/dev/null)
1485 e8f02263 2022-01-23 thomas (cd $testroot/wt && got commit -m 'test commit_large_file' \
1486 e8f02263 2022-01-23 thomas > $testroot/stdout)
1488 e8f02263 2022-01-23 thomas local head_rev=`git_show_head $testroot/repo`
1489 e8f02263 2022-01-23 thomas echo "A new" > $testroot/stdout.expected
1490 e8f02263 2022-01-23 thomas echo "Created commit $head_rev" >> $testroot/stdout.expected
1492 e8f02263 2022-01-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1494 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1495 e8f02263 2022-01-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1496 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1497 e8f02263 2022-01-23 thomas return 1
1500 e8f02263 2022-01-23 thomas new_id=`get_blob_id $testroot/repo "" new`
1501 e8f02263 2022-01-23 thomas got cat -r $testroot/repo $new_id > $testroot/new
1503 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1504 e8f02263 2022-01-23 thomas echo "commit failed unexpectedly" >&2
1505 e8f02263 2022-01-23 thomas test_done "$testroot" "1"
1506 e8f02263 2022-01-23 thomas return 1
1509 e8f02263 2022-01-23 thomas cmp -s $testroot/new $testroot/wt/new
1511 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1512 e8f02263 2022-01-23 thomas diff -u $testroot/new $testroot/wt/new
1514 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1520 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1521 c4296144 2019-05-09 stsp run_test test_commit_basic
1522 83a7ae6d 2019-05-10 stsp run_test test_commit_new_subdir
1523 83a7ae6d 2019-05-10 stsp run_test test_commit_subdir
1524 83a7ae6d 2019-05-10 stsp run_test test_commit_single_file
1525 83a7ae6d 2019-05-10 stsp run_test test_commit_out_of_date
1526 8ba6ba2d 2019-05-14 stsp run_test test_commit_added_subdirs
1527 ba580f68 2020-03-22 stsp run_test test_commit_deleted_subdirs
1528 f363d663 2019-05-23 stsp run_test test_commit_rejects_conflicted_file
1529 1a36436d 2019-06-10 stsp run_test test_commit_single_file_multiple
1530 4866d084 2019-07-10 stsp run_test test_commit_added_and_modified_in_same_dir
1531 e0233cea 2019-07-25 stsp run_test test_commit_path_prefix
1532 90e8619e 2019-07-25 stsp run_test test_commit_dir_path
1533 5c1e53bc 2019-07-28 stsp run_test test_commit_selected_paths
1534 916f288c 2019-07-30 stsp run_test test_commit_outside_refs_heads
1535 84792843 2019-08-09 stsp run_test test_commit_no_email
1536 6af1ccbd 2019-08-16 stsp run_test test_commit_tree_entry_sorting
1537 257add31 2020-09-09 stsp run_test test_commit_gotconfig_author
1538 50b0790e 2020-09-11 stsp run_test test_commit_gotconfig_worktree_author
1539 aba9c984 2019-09-08 stsp run_test test_commit_gitconfig_author
1540 1ebedb77 2019-10-19 stsp run_test test_commit_xbit_change
1541 f7b97ccb 2020-04-14 stsp run_test test_commit_normalizes_filemodes
1542 e7303626 2020-05-14 stsp run_test test_commit_with_unrelated_submodule
1543 3d9a4ec4 2020-07-23 stsp run_test test_commit_symlink
1544 5a1fbc73 2020-07-23 stsp run_test test_commit_fix_bad_symlink
1545 28cf319f 2021-01-28 stsp run_test test_commit_prepared_logmsg
1546 e8f02263 2022-01-23 thomas run_test test_commit_large_file