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`
643 ec9b5f0b 2022-07-19 thomas local errmsg=""
645 ec9b5f0b 2022-07-19 thomas errmsg="commit author's email address is required for"
646 ec9b5f0b 2022-07-19 thomas errmsg="$errmsg compatibility with Git"
648 84792843 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
650 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
651 84792843 2019-08-09 stsp test_done "$testroot" "$ret"
655 84792843 2019-08-09 stsp echo "modified alpha" > $testroot/wt/alpha
656 84792843 2019-08-09 stsp (cd $testroot/wt && env GOT_AUTHOR=":flan_hacker:" \
657 84792843 2019-08-09 stsp got commit -m 'test no email' > $testroot/stdout \
658 84792843 2019-08-09 stsp 2> $testroot/stderr)
660 ec9b5f0b 2022-07-19 thomas printf "got: :flan_hacker:: %s\n" "$errmsg" > $testroot/stderr.expected
661 84792843 2019-08-09 stsp cmp -s $testroot/stderr.expected $testroot/stderr
663 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
664 84792843 2019-08-09 stsp diff -u $testroot/stderr.expected $testroot/stderr
665 84792843 2019-08-09 stsp test_done "$testroot" "$ret"
669 84792843 2019-08-09 stsp echo -n > $testroot/stdout.expected
670 84792843 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
672 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
673 84792843 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
674 ec9b5f0b 2022-07-19 thomas test_done "$testroot" $ret
678 ec9b5f0b 2022-07-19 thomas # try again with a newline inside the email
679 ec9b5f0b 2022-07-19 thomas (cd $testroot/wt \
680 ec9b5f0b 2022-07-19 thomas && FS=' ' env GOT_AUTHOR="$(printf "Flan <hack\ner>")" \
681 ec9b5f0b 2022-07-19 thomas got commit -m 'test invalid email' > $testroot/stdout \
682 ec9b5f0b 2022-07-19 thomas 2> $testroot/stderr)
684 ec9b5f0b 2022-07-19 thomas printf "got: Flan <hack\ner>: %s\n" "$errmsg" \
685 ec9b5f0b 2022-07-19 thomas > $testroot/stderr.expected
686 ec9b5f0b 2022-07-19 thomas cmp -s $testroot/stderr.expected $testroot/stderr
688 ec9b5f0b 2022-07-19 thomas if [ $ret -ne 0 ]; then
689 ec9b5f0b 2022-07-19 thomas diff -u $testroot/stderr.expected $testroot/stderr
690 ec9b5f0b 2022-07-19 thomas test_done "$testroot" $ret
694 ec9b5f0b 2022-07-19 thomas echo -n > $testroot/stdout.expected
695 ec9b5f0b 2022-07-19 thomas cmp -s $testroot/stdout.expected $testroot/stdout
697 ec9b5f0b 2022-07-19 thomas if [ $ret -ne 0 ]; then
698 ec9b5f0b 2022-07-19 thomas diff -u $testroot/stdout.expected $testroot/stdout
699 ec9b5f0b 2022-07-19 thomas test_done "$testroot" $ret
703 ec9b5f0b 2022-07-19 thomas # try again with a < inside the email
704 ec9b5f0b 2022-07-19 thomas (cd $testroot/wt && env GOT_AUTHOR="$(printf "Flan <ha<ker>")" \
705 ec9b5f0b 2022-07-19 thomas got commit -m 'test invalid email' > $testroot/stdout \
706 ec9b5f0b 2022-07-19 thomas 2> $testroot/stderr)
708 ec9b5f0b 2022-07-19 thomas printf "got: Flan <ha<ker>: %s\n" "$errmsg" > $testroot/stderr.expected
709 ec9b5f0b 2022-07-19 thomas cmp -s $testroot/stderr.expected $testroot/stderr
711 ec9b5f0b 2022-07-19 thomas if [ $ret -ne 0 ]; then
712 ec9b5f0b 2022-07-19 thomas diff -u $testroot/stderr.expected $testroot/stderr
713 ec9b5f0b 2022-07-19 thomas test_done "$testroot" $ret
717 ec9b5f0b 2022-07-19 thomas echo -n > $testroot/stdout.expected
718 ec9b5f0b 2022-07-19 thomas cmp -s $testroot/stdout.expected $testroot/stdout
720 ec9b5f0b 2022-07-19 thomas if [ $ret -ne 0 ]; then
721 ec9b5f0b 2022-07-19 thomas diff -u $testroot/stdout.expected $testroot/stdout
723 ec9b5f0b 2022-07-19 thomas test_done "$testroot" $ret
726 f6cae3ed 2020-09-13 naddy test_commit_tree_entry_sorting() {
727 6af1ccbd 2019-08-16 stsp local testroot=`test_init commit_tree_entry_sorting`
729 6af1ccbd 2019-08-16 stsp got checkout $testroot/repo $testroot/wt > /dev/null
731 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
732 6af1ccbd 2019-08-16 stsp test_done "$testroot" "$ret"
736 6af1ccbd 2019-08-16 stsp # Git's index gets corrupted when tree entries are written in the
737 6af1ccbd 2019-08-16 stsp # order defined by got_path_cmp() rather than Git's own ordering.
738 6af1ccbd 2019-08-16 stsp # Create a new tree where a directory "got" and a file "got-version"
739 6af1ccbd 2019-08-16 stsp # would sort in the wrong order according to Git's opinion.
740 6af1ccbd 2019-08-16 stsp mkdir $testroot/wt/got
741 6af1ccbd 2019-08-16 stsp touch $testroot/wt/got/foo
742 6af1ccbd 2019-08-16 stsp echo foo > $testroot/wt/got-version
743 6af1ccbd 2019-08-16 stsp echo zzz > $testroot/wt/zzz
744 6af1ccbd 2019-08-16 stsp (cd $testroot/wt && got add got-version got/foo zzz > /dev/null)
746 6af1ccbd 2019-08-16 stsp (cd $testroot/wt && got commit -m 'test' > /dev/null)
748 6af1ccbd 2019-08-16 stsp # Let git-fsck verify the newly written tree to make sure Git is happy
749 6af1ccbd 2019-08-16 stsp (cd $testroot/repo && git fsck --strict \
750 6af1ccbd 2019-08-16 stsp > $testroot/fsck.stdout 2> $testroot/fsck.stderr)
752 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
755 18d1acad 2022-07-20 thomas test_commit_cmdline_author() {
756 18d1acad 2022-07-20 thomas local testroot=`test_init commit_cmdline_author`
758 18d1acad 2022-07-20 thomas got checkout $testroot/repo $testroot/wt > /dev/null
760 18d1acad 2022-07-20 thomas if [ $ret -ne 0 ]; then
761 18d1acad 2022-07-20 thomas test_done "$testroot" $ret
765 18d1acad 2022-07-20 thomas echo "modified alpha" > $testroot/wt/alpha
767 18d1acad 2022-07-20 thomas # first try with a -A equals to $GOT_AUTHOR
768 18d1acad 2022-07-20 thomas (cd $testroot/wt && got commit -A "$GOT_AUTHOR" -m 'edit alpha') \
769 18d1acad 2022-07-20 thomas > /dev/null 2> $testroot/stderr
771 18d1acad 2022-07-20 thomas if [ $ret -eq 0 ]; then
772 18d1acad 2022-07-20 thomas test_done "$testroot" 1
776 18d1acad 2022-07-20 thomas echo 'got: specified author is equal to the default one' \
777 18d1acad 2022-07-20 thomas > $testroot/stderr.expected
778 18d1acad 2022-07-20 thomas cmp -s $testroot/stderr.expected $testroot/stderr
780 18d1acad 2022-07-20 thomas if [ $ret -ne 0 ]; then
781 18d1acad 2022-07-20 thomas diff -u $testroot/stderr.expected $testroot/stderr
782 18d1acad 2022-07-20 thomas test_done "$testroot" $ret
786 18d1acad 2022-07-20 thomas # try again with a different author
787 18d1acad 2022-07-20 thomas local author="Foo <foo@example.com>"
788 18d1acad 2022-07-20 thomas (cd $testroot/wt && got commit -A "$author" -m 'edit alpha') \
789 18d1acad 2022-07-20 thomas > /dev/null
791 18d1acad 2022-07-20 thomas if [ $ret -ne 0 ]; then
792 18d1acad 2022-07-20 thomas test_done "$testroot" $ret
796 18d1acad 2022-07-20 thomas (cd $testroot/repo && got log -l1 | egrep '^(from|via):') \
797 18d1acad 2022-07-20 thomas > $testroot/stdout
799 18d1acad 2022-07-20 thomas if [ $ret -ne 0 ]; then
800 18d1acad 2022-07-20 thomas test_done "$testroot" $ret
804 18d1acad 2022-07-20 thomas echo "from: $author" > $testroot/stdout.expected
805 18d1acad 2022-07-20 thomas echo "via: $GOT_AUTHOR" >> $testroot/stdout.expected
806 18d1acad 2022-07-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
808 18d1acad 2022-07-20 thomas if [ $ret -ne 0 ]; then
809 18d1acad 2022-07-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
811 18d1acad 2022-07-20 thomas test_done "$testroot" $ret
814 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_author() {
815 257add31 2020-09-09 stsp local testroot=`test_init commit_gotconfig_author`
817 257add31 2020-09-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
819 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
820 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
823 257add31 2020-09-09 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
824 257add31 2020-09-09 stsp > $testroot/repo/.git/got.conf
826 257add31 2020-09-09 stsp echo "modified alpha" > $testroot/wt/alpha
827 257add31 2020-09-09 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
829 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
830 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
834 257add31 2020-09-09 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
836 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
837 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
841 257add31 2020-09-09 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
842 50b0790e 2020-09-11 stsp > $testroot/stdout.expected
843 50b0790e 2020-09-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
845 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
846 50b0790e 2020-09-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
848 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
851 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_worktree_author() {
852 50b0790e 2020-09-11 stsp local testroot=`test_init commit_gotconfig_worktree_author`
854 50b0790e 2020-09-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
856 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
857 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
860 50b0790e 2020-09-11 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
861 50b0790e 2020-09-11 stsp > $testroot/repo/.git/got.conf
862 50b0790e 2020-09-11 stsp echo 'author "Flan Squee <flan_squee@openbsd.org>"' \
863 50b0790e 2020-09-11 stsp > $testroot/wt/.got/got.conf
865 50b0790e 2020-09-11 stsp echo "modified alpha" > $testroot/wt/alpha
866 50b0790e 2020-09-11 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
868 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
869 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
873 50b0790e 2020-09-11 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
875 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
876 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
880 50b0790e 2020-09-11 stsp echo "from: Flan Squee <flan_squee@openbsd.org>" \
881 257add31 2020-09-09 stsp > $testroot/stdout.expected
882 257add31 2020-09-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
884 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
885 257add31 2020-09-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
887 6af1ccbd 2019-08-16 stsp test_done "$testroot" "$ret"
890 f6cae3ed 2020-09-13 naddy test_commit_gitconfig_author() {
891 aba9c984 2019-09-08 stsp local testroot=`test_init commit_gitconfig_author`
893 aba9c984 2019-09-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
895 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
896 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
900 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.name 'Flan Luck')
901 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
903 aba9c984 2019-09-08 stsp echo "modified alpha" > $testroot/wt/alpha
905 1f240092 2022-07-24 thomas # unset in a subshell to avoid affecting our environment
906 1f240092 2022-07-24 thomas (unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
907 1f240092 2022-07-24 thomas got commit -m 'test gitconfig author' > /dev/null)
909 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
910 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
914 aba9c984 2019-09-08 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
916 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
917 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
921 aba9c984 2019-09-08 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
922 aba9c984 2019-09-08 stsp > $testroot/stdout.expected
923 aba9c984 2019-09-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
925 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
926 aba9c984 2019-09-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
928 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
931 f6cae3ed 2020-09-13 naddy test_commit_xbit_change() {
932 1ebedb77 2019-10-19 stsp local testroot=`test_init commit_xbit_change`
934 1ebedb77 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > /dev/null
936 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
937 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
941 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
943 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
944 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
946 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
948 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
949 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
950 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
954 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
956 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
957 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
958 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
962 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
963 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
964 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
965 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
967 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
968 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
969 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
973 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
975 1ebedb77 2019-10-19 stsp echo -n > $testroot/stdout.expected
976 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
978 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
979 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
980 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
984 1ebedb77 2019-10-19 stsp chmod -x $testroot/wt/alpha
986 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
987 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
989 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
991 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
992 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
993 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
997 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
999 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1000 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
1001 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
1005 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
1006 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
1007 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1008 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1010 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1011 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1012 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
1016 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
1018 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
1019 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
1021 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1023 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1024 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1026 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1029 f6cae3ed 2020-09-13 naddy commit_check_mode() {
1030 f7b97ccb 2020-04-14 stsp local mode="$1"
1031 f7b97ccb 2020-04-14 stsp local expected_mode="$2"
1033 f7b97ccb 2020-04-14 stsp chmod 644 $testroot/wt/alpha
1034 f7b97ccb 2020-04-14 stsp echo a >> $testroot/wt/alpha
1035 f7b97ccb 2020-04-14 stsp chmod $mode $testroot/wt/alpha
1037 f7b97ccb 2020-04-14 stsp (cd $testroot/wt && got commit -mm > $testroot/stdout)
1039 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1040 f7b97ccb 2020-04-14 stsp echo "got commit failed unexpectedly"
1041 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1045 f7b97ccb 2020-04-14 stsp local commit_id=`git_show_head $testroot/repo`
1046 f7b97ccb 2020-04-14 stsp echo 'M alpha' > $testroot/stdout.expected
1047 f7b97ccb 2020-04-14 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1048 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1050 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1051 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1052 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1056 f7b97ccb 2020-04-14 stsp local tree_id=$(got cat -r $testroot/repo $commit_id | \
1057 f7b97ccb 2020-04-14 stsp grep ^tree | cut -d' ' -f2)
1058 f7b97ccb 2020-04-14 stsp local alpha_id=$(got cat -r $testroot/repo $tree_id | \
1059 f7b97ccb 2020-04-14 stsp grep 'alpha$' | cut -d' ' -f1)
1060 f7b97ccb 2020-04-14 stsp echo "$alpha_id $expected_mode alpha" > $testroot/stdout.expected
1061 f7b97ccb 2020-04-14 stsp got cat -r $testroot/repo $tree_id | grep 'alpha$' > $testroot/stdout
1062 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1064 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1065 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1067 f7b97ccb 2020-04-14 stsp return $ret
1070 f6cae3ed 2020-09-13 naddy test_commit_normalizes_filemodes() {
1071 f7b97ccb 2020-04-14 stsp local testroot=`test_init commit_normalizes_filemodes`
1073 f7b97ccb 2020-04-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1075 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1076 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1080 f7b97ccb 2020-04-14 stsp modes="600 400 460 640 440 660 444 666"
1081 f7b97ccb 2020-04-14 stsp for m in $modes; do
1082 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100644"
1084 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1088 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1089 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1092 f7b97ccb 2020-04-14 stsp modes="700 500 570 750 550 770 555 777"
1093 f7b97ccb 2020-04-14 stsp for m in $modes; do
1094 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100755"
1096 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1100 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1101 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1104 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1107 f6cae3ed 2020-09-13 naddy test_commit_with_unrelated_submodule() {
1108 e7303626 2020-05-14 stsp local testroot=`test_init commit_with_unrelated_submodule`
1110 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1112 bf3ab206 2022-10-24 thomas (cd $testroot/repo && git -c protocol.file.allow=always \
1113 bf3ab206 2022-10-24 thomas submodule -q add ../repo2)
1114 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1116 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1118 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1119 7aadece8 2020-05-17 stsp echo "checkout failed unexpectedly" >&2
1120 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1124 e7303626 2020-05-14 stsp echo "modified alpha" > $testroot/wt/alpha
1126 7aadece8 2020-05-17 stsp echo "" > $testroot/stdout.expected
1128 74ad335c 2020-06-23 stsp (cd $testroot/wt && got commit -m 'modify alpha' > $testroot/stdout)
1130 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1131 7aadece8 2020-05-17 stsp echo "commit failed unexpectedly" >&2
1132 7aadece8 2020-05-17 stsp test_done "$testroot" "$ret"
1136 7aadece8 2020-05-17 stsp local head_rev=`git_show_head $testroot/repo`
1137 7aadece8 2020-05-17 stsp echo "M alpha" > $testroot/stdout.expected
1138 7aadece8 2020-05-17 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1140 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1142 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1143 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1145 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1148 f6cae3ed 2020-09-13 naddy check_symlinks() {
1149 bd6aa359 2020-07-23 stsp local wtpath="$1"
1150 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/alpha.link ]; then
1151 bd6aa359 2020-07-23 stsp echo "alpha.link is not a symlink"
1155 bd6aa359 2020-07-23 stsp readlink $wtpath/alpha.link > $testroot/stdout
1156 bd6aa359 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1157 bd6aa359 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1159 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1160 bd6aa359 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1164 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/epsilon.link ]; then
1165 bd6aa359 2020-07-23 stsp echo "epsilon.link is not a symlink"
1169 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon.link > $testroot/stdout
1170 bd6aa359 2020-07-23 stsp echo "epsilon" > $testroot/stdout.expected
1171 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1173 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1174 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1178 bd6aa359 2020-07-23 stsp if [ -h $wtpath/passwd.link ]; then
1179 bd6aa359 2020-07-23 stsp echo -n "passwd.link is a symlink and points outside of work tree: " >&2
1180 bd6aa359 2020-07-23 stsp readlink $wtpath/passwd.link >&2
1184 bd6aa359 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
1185 bd6aa359 2020-07-23 stsp cp $wtpath/passwd.link $testroot/content
1187 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1188 bd6aa359 2020-07-23 stsp echo "cp command failed unexpectedly" >&2
1192 bd6aa359 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
1194 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1195 bd6aa359 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
1199 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon/beta.link > $testroot/stdout
1200 bd6aa359 2020-07-23 stsp echo "../beta" > $testroot/stdout.expected
1201 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1203 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1204 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1208 bd6aa359 2020-07-23 stsp readlink $wtpath/nonexistent.link > $testroot/stdout
1209 bd6aa359 2020-07-23 stsp echo "nonexistent" > $testroot/stdout.expected
1210 7aadece8 2020-05-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1212 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1213 7aadece8 2020-05-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1220 f6cae3ed 2020-09-13 naddy test_commit_symlink() {
1221 bd6aa359 2020-07-23 stsp local testroot=`test_init commit_symlink`
1223 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1225 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1226 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1230 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s alpha alpha.link)
1231 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s epsilon epsilon.link)
1232 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1233 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s ../beta epsilon/beta.link)
1234 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s nonexistent nonexistent.link)
1235 bd6aa359 2020-07-23 stsp (cd $testroot/wt && got add alpha.link epsilon.link passwd.link \
1236 bd6aa359 2020-07-23 stsp epsilon/beta.link nonexistent.link > /dev/null)
1238 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1239 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1241 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1242 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1243 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1246 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/passwd.link: " > $testroot/stderr.expected
1247 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1248 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1249 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1251 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1252 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1253 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1257 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1258 35213c7c 2020-07-23 stsp > $testroot/stdout)
1260 bd6aa359 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1261 bd6aa359 2020-07-23 stsp echo "A alpha.link" > $testroot/stdout.expected
1262 bd6aa359 2020-07-23 stsp echo "A epsilon.link" >> $testroot/stdout.expected
1263 bd6aa359 2020-07-23 stsp echo "A nonexistent.link" >> $testroot/stdout.expected
1264 bd6aa359 2020-07-23 stsp echo "A passwd.link" >> $testroot/stdout.expected
1265 bd6aa359 2020-07-23 stsp echo "A epsilon/beta.link" >> $testroot/stdout.expected
1266 bd6aa359 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1268 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1270 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1271 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1272 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1276 bd6aa359 2020-07-23 stsp # verify created in-repository tree
1277 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1279 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1280 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1283 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt2
1285 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1286 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1290 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1291 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1292 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1296 75f0a0fb 2020-07-23 stsp # 'got update' should reinstall passwd.link as a regular file
1297 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
1298 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt
1300 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1301 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1305 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
1306 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT gamma epsilon.link)
1307 88fb31d4 2020-07-23 stsp rm $testroot/wt/epsilon/beta.link
1308 88fb31d4 2020-07-23 stsp echo "this is a regular file" > $testroot/wt/epsilon/beta.link
1309 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
1310 35213c7c 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
1311 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
1312 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
1313 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf alpha new.link)
1314 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got add new.link > /dev/null)
1316 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1317 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1319 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1320 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1321 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1324 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
1325 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1326 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1327 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1329 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1330 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1331 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1335 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1336 35213c7c 2020-07-23 stsp > $testroot/stdout)
1338 88fb31d4 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1339 35213c7c 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
1340 35213c7c 2020-07-23 stsp echo "A new.link" >> $testroot/stdout.expected
1341 88fb31d4 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
1342 88fb31d4 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
1343 88fb31d4 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
1344 88fb31d4 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
1345 88fb31d4 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1347 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1349 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1350 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1351 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1355 88fb31d4 2020-07-23 stsp got tree -r $testroot/repo -c $head_rev -R > $testroot/stdout
1356 88fb31d4 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
1358 88fb31d4 2020-07-23 stsp alpha.link@ -> beta
1360 35213c7c 2020-07-23 stsp dotgotbar.link@ -> .got/bar
1362 88fb31d4 2020-07-23 stsp epsilon/beta.link
1363 88fb31d4 2020-07-23 stsp epsilon/zeta
1364 88fb31d4 2020-07-23 stsp epsilon.link@ -> gamma
1366 88fb31d4 2020-07-23 stsp gamma/delta
1367 88fb31d4 2020-07-23 stsp new.link@ -> alpha
1368 88fb31d4 2020-07-23 stsp passwd.link@ -> /etc/passwd
1370 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1372 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1373 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1375 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1378 f6cae3ed 2020-09-13 naddy test_commit_fix_bad_symlink() {
1379 5a1fbc73 2020-07-23 stsp local testroot=`test_init commit_fix_bad_symlink`
1381 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1383 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1384 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1385 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1389 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1390 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got add passwd.link > /dev/null)
1392 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'commit bad symlink' \
1393 35213c7c 2020-07-23 stsp > $testroot/stdout)
1395 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1396 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1397 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1400 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update >/dev/null)
1401 5a1fbc73 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
1402 5a1fbc73 2020-07-23 stsp echo "passwd.link is a symlink but should be a regular file" >&2
1403 5a1fbc73 2020-07-23 stsp test_done "$testroot" "1"
1407 5a1fbc73 2020-07-23 stsp # create another work tree which will contain the "bad" symlink
1408 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1410 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1411 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1412 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1416 5a1fbc73 2020-07-23 stsp # change "bad" symlink back into a "good" symlink
1417 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT alpha passwd.link)
1419 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got commit -m 'fix bad symlink' \
1420 5a1fbc73 2020-07-23 stsp > $testroot/stdout)
1422 5a1fbc73 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1423 5a1fbc73 2020-07-23 stsp echo "M passwd.link" > $testroot/stdout.expected
1424 5a1fbc73 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1426 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1428 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1429 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1430 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1434 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1435 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1436 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1440 5a1fbc73 2020-07-23 stsp readlink $testroot/wt/passwd.link > $testroot/stdout
1441 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1442 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1444 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1445 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1449 5a1fbc73 2020-07-23 stsp # Update the other work tree; the bad symlink should be fixed
1450 5a1fbc73 2020-07-23 stsp (cd $testroot/wt2 && got update > /dev/null)
1452 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1453 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1454 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1458 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt2/passwd.link ]; then
1459 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1460 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1464 5a1fbc73 2020-07-23 stsp readlink $testroot/wt2/passwd.link > $testroot/stdout
1465 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1466 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1468 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1469 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1473 bd6aa359 2020-07-23 stsp test_done "$testroot" "0"
1476 28cf319f 2021-01-28 stsp test_commit_prepared_logmsg() {
1477 28cf319f 2021-01-28 stsp local testroot=`test_init commit_prepared_logmsg`
1479 28cf319f 2021-01-28 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1481 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1482 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1486 28cf319f 2021-01-28 stsp echo "modified alpha" > $testroot/wt/alpha
1487 28cf319f 2021-01-28 stsp (cd $testroot/wt && got rm beta >/dev/null)
1488 28cf319f 2021-01-28 stsp echo "new file" > $testroot/wt/new
1489 28cf319f 2021-01-28 stsp (cd $testroot/wt && got add new >/dev/null)
1491 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg' > $testroot/logmsg
1493 28cf319f 2021-01-28 stsp cat > $testroot/editor.sh <<EOF
1495 c206b220 2021-10-09 thomas SOPTS='-i ""'
1496 c206b220 2021-10-09 thomas [ "\$OSTYPE" = "linux-gnu" ] && SOPTS="-i"
1497 c206b220 2021-10-09 thomas sed "\$SOPTS" -e 's/foo/bar/' "\$1"
1499 28cf319f 2021-01-28 stsp chmod +x $testroot/editor.sh
1501 8e09a168 2021-06-17 tracey (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1502 28cf319f 2021-01-28 stsp got commit -F "$testroot/logmsg" > $testroot/stdout)
1504 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1505 28cf319f 2021-01-28 stsp echo "A new" > $testroot/stdout.expected
1506 28cf319f 2021-01-28 stsp echo "M alpha" >> $testroot/stdout.expected
1507 28cf319f 2021-01-28 stsp echo "D beta" >> $testroot/stdout.expected
1508 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1510 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1512 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1513 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1514 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1518 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1519 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
1520 fa37079f 2021-10-09 thomas export LC_TIME=C
1521 fa37079f 2021-10-09 thomas d=`date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
1522 fa37079f 2021-10-09 thomas LC_TIME="$prev_LC_TIME"
1523 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" > $testroot/stdout.expected
1524 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1525 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1526 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1527 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1528 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg" >> $testroot/stdout.expected
1529 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1531 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1532 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1534 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1535 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1536 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1540 28cf319f 2021-01-28 stsp echo "modified alpha again" > $testroot/wt/alpha
1542 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg non-interactive' \
1543 28cf319f 2021-01-28 stsp > $testroot/logmsg
1545 28cf319f 2021-01-28 stsp (cd $testroot/wt && got commit -N -F "$testroot/logmsg" \
1546 28cf319f 2021-01-28 stsp > $testroot/stdout)
1548 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1549 28cf319f 2021-01-28 stsp echo "M alpha" > $testroot/stdout.expected
1550 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1552 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1554 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1555 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1556 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1560 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1561 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
1562 fa37079f 2021-10-09 thomas export LC_TIME=C
1563 fa37079f 2021-10-09 thomas d=`date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
1564 fa37079f 2021-10-09 thomas LC_TIME="$prev_LC_TIME"
1565 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" \
1566 28cf319f 2021-01-28 stsp > $testroot/stdout.expected
1567 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1568 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1569 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1570 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1571 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg non-interactive" \
1572 28cf319f 2021-01-28 stsp >> $testroot/stdout.expected
1573 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1575 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1576 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1578 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1579 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1581 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1584 e8f02263 2022-01-23 thomas test_commit_large_file() {
1585 e8f02263 2022-01-23 thomas local testroot=`test_init commit_large_file`
1587 e8f02263 2022-01-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1589 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1590 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1591 e8f02263 2022-01-23 thomas return 1
1594 b9e845cd 2022-07-06 thomas dd status=none if=/dev/zero of=$testroot/wt/new bs=1M count=64
1595 e8f02263 2022-01-23 thomas (cd $testroot/wt && got add new >/dev/null)
1597 e8f02263 2022-01-23 thomas (cd $testroot/wt && got commit -m 'test commit_large_file' \
1598 e8f02263 2022-01-23 thomas > $testroot/stdout)
1600 e8f02263 2022-01-23 thomas local head_rev=`git_show_head $testroot/repo`
1601 e8f02263 2022-01-23 thomas echo "A new" > $testroot/stdout.expected
1602 e8f02263 2022-01-23 thomas echo "Created commit $head_rev" >> $testroot/stdout.expected
1604 e8f02263 2022-01-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1606 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1607 e8f02263 2022-01-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1608 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1609 e8f02263 2022-01-23 thomas return 1
1612 e8f02263 2022-01-23 thomas new_id=`get_blob_id $testroot/repo "" new`
1613 e8f02263 2022-01-23 thomas got cat -r $testroot/repo $new_id > $testroot/new
1615 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1616 e8f02263 2022-01-23 thomas echo "commit failed unexpectedly" >&2
1617 e8f02263 2022-01-23 thomas test_done "$testroot" "1"
1618 e8f02263 2022-01-23 thomas return 1
1621 e8f02263 2022-01-23 thomas cmp -s $testroot/new $testroot/wt/new
1623 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1624 e8f02263 2022-01-23 thomas diff -u $testroot/new $testroot/wt/new
1626 e8f02263 2022-01-23 thomas test_done "$testroot" "$ret"
1631 43896ae6 2022-09-02 thomas test_commit_gitignore() {
1632 43896ae6 2022-09-02 thomas local testroot=`test_init commit_gitignores`
1634 43896ae6 2022-09-02 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1636 43896ae6 2022-09-02 thomas if [ $ret -ne 0 ]; then
1637 43896ae6 2022-09-02 thomas test_done "$testroot" "$ret"
1638 43896ae6 2022-09-02 thomas return 1
1641 43896ae6 2022-09-02 thomas mkdir -p $testroot/wt/tree1/foo
1642 43896ae6 2022-09-02 thomas mkdir -p $testroot/wt/tree2/foo
1643 43896ae6 2022-09-02 thomas echo "tree1/**" > $testroot/wt/.gitignore
1644 43896ae6 2022-09-02 thomas echo "tree2/**" >> $testroot/wt/.gitignore
1645 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/tree1/bar
1646 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/tree1/foo/baz
1647 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/tree2/bar
1648 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/tree2/foo/baz
1649 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/epsilon/zeta1
1650 43896ae6 2022-09-02 thomas echo -n > $testroot/wt/epsilon/zeta2
1652 43896ae6 2022-09-02 thomas (cd $testroot/wt && got add -I -R tree1 > /dev/null)
1653 43896ae6 2022-09-02 thomas (cd $testroot/wt && got add -I tree2/foo/baz > /dev/null)
1654 43896ae6 2022-09-02 thomas (cd $testroot/wt && got commit -m "gitignore add" > /dev/null)
1655 43896ae6 2022-09-02 thomas (cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1657 43896ae6 2022-09-02 thomas echo ' gitignore add' > $testroot/stdout.expected
1658 43896ae6 2022-09-02 thomas echo ' A tree1/bar' >> $testroot/stdout.expected
1659 43896ae6 2022-09-02 thomas echo ' A tree1/foo/baz' >> $testroot/stdout.expected
1660 43896ae6 2022-09-02 thomas echo ' A tree2/foo/baz' >> $testroot/stdout.expected
1662 43896ae6 2022-09-02 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1664 43896ae6 2022-09-02 thomas if [ $ret -ne 0 ]; then
1665 43896ae6 2022-09-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
1666 43896ae6 2022-09-02 thomas test_done "$testroot" "$ret"
1667 43896ae6 2022-09-02 thomas return 1
1670 43896ae6 2022-09-02 thomas echo touch > $testroot/wt/tree1/bar
1671 43896ae6 2022-09-02 thomas echo touch > $testroot/wt/tree1/foo/baz
1672 43896ae6 2022-09-02 thomas echo touch > $testroot/wt/epsilon/zeta1
1674 43896ae6 2022-09-02 thomas (cd $testroot/wt && got commit -m "gitignore change" > /dev/null)
1675 43896ae6 2022-09-02 thomas (cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1677 43896ae6 2022-09-02 thomas echo ' gitignore change' > $testroot/stdout.expected
1678 43896ae6 2022-09-02 thomas echo ' M tree1/bar' >> $testroot/stdout.expected
1679 43896ae6 2022-09-02 thomas echo ' M tree1/foo/baz' >> $testroot/stdout.expected
1681 43896ae6 2022-09-02 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1683 43896ae6 2022-09-02 thomas if [ $ret -ne 0 ]; then
1684 43896ae6 2022-09-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
1685 43896ae6 2022-09-02 thomas test_done "$testroot" "$ret"
1686 43896ae6 2022-09-02 thomas return 1
1689 43896ae6 2022-09-02 thomas test_done "$testroot" "$ret"
1692 3d47d5be 2022-10-31 thomas test_commit_bad_author() {
1693 3d47d5be 2022-10-31 thomas local testroot=`test_init commit_bad_author`
1695 3d47d5be 2022-10-31 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1697 3d47d5be 2022-10-31 thomas if [ $ret -ne 0 ]; then
1698 3d47d5be 2022-10-31 thomas test_done "$testroot" $ret
1699 3d47d5be 2022-10-31 thomas return 1
1702 3d47d5be 2022-10-31 thomas echo "modified alpha" > $testroot/wt/alpha
1704 3d47d5be 2022-10-31 thomas (cd $testroot/wt && got commit \
1705 3d47d5be 2022-10-31 thomas -A "${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>" -m 'edit alpha') \
1706 3d47d5be 2022-10-31 thomas > /dev/null 2> $testroot/stderr
1708 3d47d5be 2022-10-31 thomas if [ $ret -eq 0 ]; then
1709 3d47d5be 2022-10-31 thomas test_done "$testroot" 1
1710 3d47d5be 2022-10-31 thomas return 1
1713 3d47d5be 2022-10-31 thomas echo -n "got: ${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>: " \
1714 3d47d5be 2022-10-31 thomas > $testroot/stderr.expected
1715 3d47d5be 2022-10-31 thomas echo -n 'space between author name and email required: ' \
1716 3d47d5be 2022-10-31 thomas >> $testroot/stderr.expected
1717 3d47d5be 2022-10-31 thomas echo 'commit author formatting would make Git unhappy' \
1718 3d47d5be 2022-10-31 thomas >> $testroot/stderr.expected
1719 3d47d5be 2022-10-31 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1721 3d47d5be 2022-10-31 thomas if [ $ret -ne 0 ]; then
1722 3d47d5be 2022-10-31 thomas diff -u $testroot/stderr.expected $testroot/stderr
1723 3d47d5be 2022-10-31 thomas test_done "$testroot" $ret
1724 3d47d5be 2022-10-31 thomas return 1
1727 3d47d5be 2022-10-31 thomas test_done "$testroot" 0
1730 3f4f8b5a 2023-01-31 thomas test_commit_logmsg_ref() {
1731 3f4f8b5a 2023-01-31 thomas local testroot=`test_init commit_logmsg_ref`
1733 3f4f8b5a 2023-01-31 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1735 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1736 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1737 3f4f8b5a 2023-01-31 thomas return 1
1740 3f4f8b5a 2023-01-31 thomas (cd $testroot/repo && git checkout -q -b newbranch)
1742 3f4f8b5a 2023-01-31 thomas local bo_logmsg_prefix="log message of backed-out commit"
1743 3f4f8b5a 2023-01-31 thomas local cy_logmsg_prefix="log message of cherrypicked commit"
1744 3f4f8b5a 2023-01-31 thomas local branch_rev_logmsg="changes on newbranch to cherrypick"
1745 3f4f8b5a 2023-01-31 thomas local branch_rev2_logmsg="modified zeta on newbranch to cherrypick"
1747 3f4f8b5a 2023-01-31 thomas echo "modified delta on branch" > $testroot/repo/gamma/delta
1748 3f4f8b5a 2023-01-31 thomas echo "modified alpha on branch" > $testroot/repo/alpha
1749 3f4f8b5a 2023-01-31 thomas (cd $testroot/repo && git rm -q beta)
1750 3f4f8b5a 2023-01-31 thomas echo "new file on branch" > $testroot/repo/epsilon/new
1751 3f4f8b5a 2023-01-31 thomas (cd $testroot/repo && git add epsilon/new)
1753 3f4f8b5a 2023-01-31 thomas git_commit $testroot/repo -m "$branch_rev_logmsg"
1754 3f4f8b5a 2023-01-31 thomas local branch_rev=`git_show_head $testroot/repo`
1756 3f4f8b5a 2023-01-31 thomas echo "modified zeta on branch" > $testroot/repo/epsilon/zeta
1758 3f4f8b5a 2023-01-31 thomas git_commit $testroot/repo -m "$branch_rev2_logmsg"
1759 3f4f8b5a 2023-01-31 thomas local branch_rev2=`git_show_head $testroot/repo`
1761 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1762 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got cherrypick $branch_rev2 > /dev/null)
1764 3f4f8b5a 2023-01-31 thomas cat > $testroot/editor.sh <<EOF
1765 3f4f8b5a 2023-01-31 thomas #!/bin/sh
1766 3f4f8b5a 2023-01-31 thomas sed -i 's/# l/l/' "\$1"
1768 3f4f8b5a 2023-01-31 thomas chmod +x $testroot/editor.sh
1770 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1771 3f4f8b5a 2023-01-31 thomas got commit > /dev/null)
1773 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1774 3f4f8b5a 2023-01-31 thomas echo "'got commit' failed unexpectedly" >&2
1775 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "1"
1776 3f4f8b5a 2023-01-31 thomas return 1
1779 3f4f8b5a 2023-01-31 thomas # check that multiple cherrypicked log messages populate the editor
1780 3f4f8b5a 2023-01-31 thomas local first=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | head -1`
1781 3f4f8b5a 2023-01-31 thomas local second=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | tail -1`
1783 3f4f8b5a 2023-01-31 thomas if [ $branch_rev == $first ]; then
1784 3f4f8b5a 2023-01-31 thomas local first_msg=$branch_rev_logmsg
1785 3f4f8b5a 2023-01-31 thomas local second_msg=$branch_rev2_logmsg
1787 3f4f8b5a 2023-01-31 thomas local first_msg=$branch_rev2_logmsg
1788 3f4f8b5a 2023-01-31 thomas local second_msg=$branch_rev_logmsg
1791 3f4f8b5a 2023-01-31 thomas echo " $cy_logmsg_prefix $first:" > $testroot/stdout.expected
1792 3f4f8b5a 2023-01-31 thomas echo " $first_msg" >> $testroot/stdout.expected
1793 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1794 3f4f8b5a 2023-01-31 thomas echo " $cy_logmsg_prefix $second:" >> $testroot/stdout.expected
1795 3f4f8b5a 2023-01-31 thomas echo " $second_msg" >> $testroot/stdout.expected
1796 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1798 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got log -l2 | \
1799 3f4f8b5a 2023-01-31 thomas grep -A2 'log message' | sed '/^--/d' > $testroot/stdout)
1801 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1803 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1804 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1805 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1806 3f4f8b5a 2023-01-31 thomas return 1
1809 3f4f8b5a 2023-01-31 thomas # check that only the relevant log message populates the editor
1810 3f4f8b5a 2023-01-31 thomas # when the changes from one of two backout commits are reverted
1811 3f4f8b5a 2023-01-31 thomas got checkout $testroot/repo $testroot/wt2 > /dev/null
1813 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1814 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1815 3f4f8b5a 2023-01-31 thomas return 1
1818 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && got backout $branch_rev > /dev/null)
1819 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && got backout $branch_rev2 > /dev/null)
1820 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && got revert epsilon/zeta > /dev/null)
1822 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && env VISUAL="$testroot/editor.sh" \
1823 3f4f8b5a 2023-01-31 thomas got commit > /dev/null)
1825 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1826 3f4f8b5a 2023-01-31 thomas echo "'got commit' failed unexpectedly" >&2
1827 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "1"
1828 3f4f8b5a 2023-01-31 thomas return 1
1831 3f4f8b5a 2023-01-31 thomas echo " $bo_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1832 3f4f8b5a 2023-01-31 thomas echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1833 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1835 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && got log -l1 | \
1836 3f4f8b5a 2023-01-31 thomas grep -A2 'log message' > $testroot/stdout)
1838 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1840 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1841 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1842 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1843 3f4f8b5a 2023-01-31 thomas return 1
1846 3f4f8b5a 2023-01-31 thomas # check that a cherrypicked log message is still
1847 3f4f8b5a 2023-01-31 thomas # used when its changes are only partially reverted
1848 3f4f8b5a 2023-01-31 thomas branch_rev_logmsg="changes to cherrypick and partially revert"
1850 3f4f8b5a 2023-01-31 thomas echo "newline in alpha" >> $testroot/repo/alpha
1851 3f4f8b5a 2023-01-31 thomas echo "modified epsilon/zeta on branch" > $testroot/repo/epsilon/zeta
1853 3f4f8b5a 2023-01-31 thomas git_commit $testroot/repo -m "$branch_rev_logmsg"
1854 3f4f8b5a 2023-01-31 thomas branch_rev=`git_show_head $testroot/repo`
1856 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1857 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got revert alpha > /dev/null)
1859 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1860 3f4f8b5a 2023-01-31 thomas got commit > /dev/null)
1862 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1863 3f4f8b5a 2023-01-31 thomas echo "'got commit' failed unexpectedly" >&2
1864 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "1"
1865 3f4f8b5a 2023-01-31 thomas return 1
1868 3f4f8b5a 2023-01-31 thomas echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1869 3f4f8b5a 2023-01-31 thomas echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1870 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1872 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got log -l1 | \
1873 3f4f8b5a 2023-01-31 thomas grep -A2 'log message' > $testroot/stdout)
1875 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1877 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1878 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1879 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1880 3f4f8b5a 2023-01-31 thomas return 1
1883 3f4f8b5a 2023-01-31 thomas # check we don't use and consequently delete the logmsg ref of a
1884 3f4f8b5a 2023-01-31 thomas # cherrypicked commit when omitting its changed path from the commit
1885 3f4f8b5a 2023-01-31 thomas branch_rev_logmsg="changes to cherrypick but omit from the commit"
1887 3f4f8b5a 2023-01-31 thomas echo "changed delta" >> $testroot/repo/gamma/delta
1889 3f4f8b5a 2023-01-31 thomas git_commit $testroot/repo -m "$branch_rev_logmsg"
1890 3f4f8b5a 2023-01-31 thomas local author_time=`git_show_author_time $testroot/repo`
1891 3f4f8b5a 2023-01-31 thomas local d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1892 3f4f8b5a 2023-01-31 thomas branch_rev=`git_show_head $testroot/repo`
1894 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got update > /dev/null)
1896 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1897 3f4f8b5a 2023-01-31 thomas echo "got update failed unexpectedly" >&2
1898 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1899 3f4f8b5a 2023-01-31 thomas return 1
1902 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1904 3f4f8b5a 2023-01-31 thomas echo "changed alpha" >> $testroot/wt/alpha
1906 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got commit -m \
1907 3f4f8b5a 2023-01-31 thomas "don't commit cy change to gamma/delta" alpha > /dev/null)
1909 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1910 3f4f8b5a 2023-01-31 thomas echo "'got commit' failed unexpectedly" >&2
1911 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "1"
1912 3f4f8b5a 2023-01-31 thomas return 1
1915 3f4f8b5a 2023-01-31 thomas # confirm logmsg ref was not deleted with got cherrypick -l
1916 3f4f8b5a 2023-01-31 thomas echo "-----------------------------------------------" \
1917 3f4f8b5a 2023-01-31 thomas > $testroot/stdout.expected
1918 f35e52a9 2023-01-31 thomas echo "cherrypick $branch_rev (newbranch)" >> $testroot/stdout.expected
1919 3f4f8b5a 2023-01-31 thomas echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1920 3f4f8b5a 2023-01-31 thomas echo "date: $d" >> $testroot/stdout.expected
1921 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1922 3f4f8b5a 2023-01-31 thomas echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1923 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1924 3f4f8b5a 2023-01-31 thomas echo " M gamma/delta" >> $testroot/stdout.expected
1925 3f4f8b5a 2023-01-31 thomas echo >> $testroot/stdout.expected
1927 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got cherrypick -l > $testroot/stdout)
1929 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1931 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1932 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1933 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1934 3f4f8b5a 2023-01-31 thomas return 1
1937 3f4f8b5a 2023-01-31 thomas # confirm a previously unused logmsg ref is picked up
1938 3f4f8b5a 2023-01-31 thomas # when an affected path is actually committed
1939 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1940 3f4f8b5a 2023-01-31 thomas got commit > /dev/null)
1942 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1943 3f4f8b5a 2023-01-31 thomas echo "'got commit' failed unexpectedly" >&2
1944 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "1"
1945 3f4f8b5a 2023-01-31 thomas return 1
1948 3f4f8b5a 2023-01-31 thomas echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1949 3f4f8b5a 2023-01-31 thomas echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1950 3f4f8b5a 2023-01-31 thomas echo " " >> $testroot/stdout.expected
1952 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got log -l1 | \
1953 3f4f8b5a 2023-01-31 thomas grep -A2 'log message' > $testroot/stdout)
1955 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1957 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1958 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1959 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1960 3f4f8b5a 2023-01-31 thomas return 1
1963 3f4f8b5a 2023-01-31 thomas # make sure we are not littering work trees
1964 3f4f8b5a 2023-01-31 thomas # by leaving temp got-logmsg-* files behind
1965 3f4f8b5a 2023-01-31 thomas echo -n > $testroot/stdout.expected
1966 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt && got status > $testroot/stdout)
1968 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1970 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1971 3f4f8b5a 2023-01-31 thomas echo "$testroot/wt is not clean"
1972 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1973 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1974 3f4f8b5a 2023-01-31 thomas return 1
1977 3f4f8b5a 2023-01-31 thomas (cd $testroot/wt2 && got status > $testroot/stdout)
1979 3f4f8b5a 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1981 3f4f8b5a 2023-01-31 thomas if [ $ret -ne 0 ]; then
1982 3f4f8b5a 2023-01-31 thomas echo "$testroot/repo is not clean"
1983 3f4f8b5a 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1985 3f4f8b5a 2023-01-31 thomas test_done "$testroot" "$ret"
1988 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1989 c4296144 2019-05-09 stsp run_test test_commit_basic
1990 83a7ae6d 2019-05-10 stsp run_test test_commit_new_subdir
1991 83a7ae6d 2019-05-10 stsp run_test test_commit_subdir
1992 83a7ae6d 2019-05-10 stsp run_test test_commit_single_file
1993 83a7ae6d 2019-05-10 stsp run_test test_commit_out_of_date
1994 8ba6ba2d 2019-05-14 stsp run_test test_commit_added_subdirs
1995 ba580f68 2020-03-22 stsp run_test test_commit_deleted_subdirs
1996 f363d663 2019-05-23 stsp run_test test_commit_rejects_conflicted_file
1997 1a36436d 2019-06-10 stsp run_test test_commit_single_file_multiple
1998 4866d084 2019-07-10 stsp run_test test_commit_added_and_modified_in_same_dir
1999 e0233cea 2019-07-25 stsp run_test test_commit_path_prefix
2000 90e8619e 2019-07-25 stsp run_test test_commit_dir_path
2001 5c1e53bc 2019-07-28 stsp run_test test_commit_selected_paths
2002 916f288c 2019-07-30 stsp run_test test_commit_outside_refs_heads
2003 84792843 2019-08-09 stsp run_test test_commit_no_email
2004 6af1ccbd 2019-08-16 stsp run_test test_commit_tree_entry_sorting
2005 18d1acad 2022-07-20 thomas run_test test_commit_cmdline_author
2006 257add31 2020-09-09 stsp run_test test_commit_gotconfig_author
2007 50b0790e 2020-09-11 stsp run_test test_commit_gotconfig_worktree_author
2008 aba9c984 2019-09-08 stsp run_test test_commit_gitconfig_author
2009 1ebedb77 2019-10-19 stsp run_test test_commit_xbit_change
2010 f7b97ccb 2020-04-14 stsp run_test test_commit_normalizes_filemodes
2011 e7303626 2020-05-14 stsp run_test test_commit_with_unrelated_submodule
2012 3d9a4ec4 2020-07-23 stsp run_test test_commit_symlink
2013 5a1fbc73 2020-07-23 stsp run_test test_commit_fix_bad_symlink
2014 28cf319f 2021-01-28 stsp run_test test_commit_prepared_logmsg
2015 e8f02263 2022-01-23 thomas run_test test_commit_large_file
2016 43896ae6 2022-09-02 thomas run_test test_commit_gitignore
2017 3d47d5be 2022-10-31 thomas run_test test_commit_bad_author
2018 3f4f8b5a 2023-01-31 thomas run_test test_commit_logmsg_ref
