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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 8469d821 2022-06-25 stsp echo "commit - $commit1" >> $testroot/stdout.expected
432 8469d821 2022-06-25 stsp 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 8469d821 2022-06-25 stsp echo "commit - $commit2" >> $testroot/stdout.expected
476 8469d821 2022-06-25 stsp 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 cf208ddd 2022-07-19 op local errmsg=""
645 cf208ddd 2022-07-19 op errmsg="commit author's email address is required for"
646 cf208ddd 2022-07-19 op errmsg="$errmsg compatibility with Git"
648 84792843 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
650 49c543a6 2022-03-31 naddy 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 cf208ddd 2022-07-19 op printf "got: :flan_hacker:: %s\n" "$errmsg" > $testroot/stderr.expected
661 84792843 2019-08-09 stsp cmp -s $testroot/stderr.expected $testroot/stderr
663 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
673 84792843 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
674 cf208ddd 2022-07-19 op test_done "$testroot" $ret
678 cf208ddd 2022-07-19 op # try again with a newline inside the email
679 cf208ddd 2022-07-19 op (cd $testroot/wt \
680 cf208ddd 2022-07-19 op && FS=' ' env GOT_AUTHOR="$(printf "Flan <hack\ner>")" \
681 cf208ddd 2022-07-19 op got commit -m 'test invalid email' > $testroot/stdout \
682 cf208ddd 2022-07-19 op 2> $testroot/stderr)
684 cf208ddd 2022-07-19 op printf "got: Flan <hack\ner>: %s\n" "$errmsg" \
685 cf208ddd 2022-07-19 op > $testroot/stderr.expected
686 cf208ddd 2022-07-19 op cmp -s $testroot/stderr.expected $testroot/stderr
688 cf208ddd 2022-07-19 op if [ $ret -ne 0 ]; then
689 cf208ddd 2022-07-19 op diff -u $testroot/stderr.expected $testroot/stderr
690 cf208ddd 2022-07-19 op test_done "$testroot" $ret
694 cf208ddd 2022-07-19 op echo -n > $testroot/stdout.expected
695 cf208ddd 2022-07-19 op cmp -s $testroot/stdout.expected $testroot/stdout
697 cf208ddd 2022-07-19 op if [ $ret -ne 0 ]; then
698 cf208ddd 2022-07-19 op diff -u $testroot/stdout.expected $testroot/stdout
699 cf208ddd 2022-07-19 op test_done "$testroot" $ret
703 cf208ddd 2022-07-19 op # try again with a < inside the email
704 cf208ddd 2022-07-19 op (cd $testroot/wt && env GOT_AUTHOR="$(printf "Flan <ha<ker>")" \
705 cf208ddd 2022-07-19 op got commit -m 'test invalid email' > $testroot/stdout \
706 cf208ddd 2022-07-19 op 2> $testroot/stderr)
708 cf208ddd 2022-07-19 op printf "got: Flan <ha<ker>: %s\n" "$errmsg" > $testroot/stderr.expected
709 cf208ddd 2022-07-19 op cmp -s $testroot/stderr.expected $testroot/stderr
711 cf208ddd 2022-07-19 op if [ $ret -ne 0 ]; then
712 cf208ddd 2022-07-19 op diff -u $testroot/stderr.expected $testroot/stderr
713 cf208ddd 2022-07-19 op test_done "$testroot" $ret
717 cf208ddd 2022-07-19 op echo -n > $testroot/stdout.expected
718 cf208ddd 2022-07-19 op cmp -s $testroot/stdout.expected $testroot/stdout
720 cf208ddd 2022-07-19 op if [ $ret -ne 0 ]; then
721 cf208ddd 2022-07-19 op diff -u $testroot/stdout.expected $testroot/stdout
723 cf208ddd 2022-07-19 op 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 49c543a6 2022-03-31 naddy 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 62b21d33 2022-07-19 op test_commit_cmdline_author() {
756 62b21d33 2022-07-19 op local testroot=`test_init commit_cmdline_author`
758 62b21d33 2022-07-19 op got checkout $testroot/repo $testroot/wt > /dev/null
760 62b21d33 2022-07-19 op if [ $ret -ne 0 ]; then
761 62b21d33 2022-07-19 op test_done "$testroot" $ret
765 62b21d33 2022-07-19 op echo "modified alpha" > $testroot/wt/alpha
767 62b21d33 2022-07-19 op local author="Foo <foo@example.com>"
768 62b21d33 2022-07-19 op (cd $testroot/wt && got commit -A "$author" -m 'edit alpha') \
771 62b21d33 2022-07-19 op if [ $ret -ne 0 ]; then
772 62b21d33 2022-07-19 op test_done "$testroot" $ret
776 62b21d33 2022-07-19 op (cd $testroot/repo && got log -l1 | egrep '^(from|via):') \
777 62b21d33 2022-07-19 op > $testroot/stdout
779 62b21d33 2022-07-19 op if [ $ret -ne 0 ]; then
780 62b21d33 2022-07-19 op test_done "$testroot" $ret
784 62b21d33 2022-07-19 op echo "from: $author" > $testroot/stdout.expected
785 62b21d33 2022-07-19 op echo "via: $GOT_AUTHOR" >> $testroot/stdout.expected
786 62b21d33 2022-07-19 op cmp -s $testroot/stdout.expected $testroot/stdout
788 62b21d33 2022-07-19 op if [ $ret -ne 0 ]; then
789 62b21d33 2022-07-19 op diff -u $testroot/stdout.expected $testroot/stdout
791 62b21d33 2022-07-19 op test_done "$testroot" $ret
794 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_author() {
795 257add31 2020-09-09 stsp local testroot=`test_init commit_gotconfig_author`
797 257add31 2020-09-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
799 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
800 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
803 257add31 2020-09-09 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
804 257add31 2020-09-09 stsp > $testroot/repo/.git/got.conf
806 257add31 2020-09-09 stsp echo "modified alpha" > $testroot/wt/alpha
807 257add31 2020-09-09 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
809 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
810 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
814 257add31 2020-09-09 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
816 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
817 257add31 2020-09-09 stsp test_done "$testroot" "$ret"
821 257add31 2020-09-09 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
822 50b0790e 2020-09-11 stsp > $testroot/stdout.expected
823 50b0790e 2020-09-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
825 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
826 50b0790e 2020-09-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
828 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
831 f6cae3ed 2020-09-13 naddy test_commit_gotconfig_worktree_author() {
832 50b0790e 2020-09-11 stsp local testroot=`test_init commit_gotconfig_worktree_author`
834 50b0790e 2020-09-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
836 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
837 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
840 50b0790e 2020-09-11 stsp echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
841 50b0790e 2020-09-11 stsp > $testroot/repo/.git/got.conf
842 50b0790e 2020-09-11 stsp echo 'author "Flan Squee <flan_squee@openbsd.org>"' \
843 50b0790e 2020-09-11 stsp > $testroot/wt/.got/got.conf
845 50b0790e 2020-09-11 stsp echo "modified alpha" > $testroot/wt/alpha
846 50b0790e 2020-09-11 stsp (cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
848 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
849 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
853 50b0790e 2020-09-11 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
855 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
856 50b0790e 2020-09-11 stsp test_done "$testroot" "$ret"
860 50b0790e 2020-09-11 stsp echo "from: Flan Squee <flan_squee@openbsd.org>" \
861 257add31 2020-09-09 stsp > $testroot/stdout.expected
862 257add31 2020-09-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
864 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
865 257add31 2020-09-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
867 6af1ccbd 2019-08-16 stsp test_done "$testroot" "$ret"
870 f6cae3ed 2020-09-13 naddy test_commit_gitconfig_author() {
871 aba9c984 2019-09-08 stsp local testroot=`test_init commit_gitconfig_author`
873 aba9c984 2019-09-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
875 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
876 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
880 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.name 'Flan Luck')
881 aba9c984 2019-09-08 stsp (cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
883 aba9c984 2019-09-08 stsp echo "modified alpha" > $testroot/wt/alpha
885 7370f802 2022-07-24 op # unset in a subshell to avoid affecting our environment
886 7370f802 2022-07-24 op (unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
887 7370f802 2022-07-24 op got commit -m 'test gitconfig author' > /dev/null)
889 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
890 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
894 aba9c984 2019-09-08 stsp (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
896 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
897 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
901 aba9c984 2019-09-08 stsp echo "from: Flan Luck <flan_luck@openbsd.org>" \
902 aba9c984 2019-09-08 stsp > $testroot/stdout.expected
903 aba9c984 2019-09-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
905 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
906 aba9c984 2019-09-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
908 aba9c984 2019-09-08 stsp test_done "$testroot" "$ret"
911 f6cae3ed 2020-09-13 naddy test_commit_xbit_change() {
912 1ebedb77 2019-10-19 stsp local testroot=`test_init commit_xbit_change`
914 1ebedb77 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > /dev/null
916 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
917 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
921 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
923 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
924 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
926 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
928 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
929 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
930 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
934 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
936 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
937 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
938 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
942 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
943 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
944 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
945 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
947 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
948 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
949 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
953 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
955 1ebedb77 2019-10-19 stsp echo -n > $testroot/stdout.expected
956 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
958 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
959 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
960 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
964 1ebedb77 2019-10-19 stsp chmod -x $testroot/wt/alpha
966 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
967 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
969 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
971 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
972 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
973 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
977 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got commit -mx > $testroot/stdout)
979 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
980 1ebedb77 2019-10-19 stsp echo "got commit failed unexpectedly"
981 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
985 1ebedb77 2019-10-19 stsp local commit_id=`git_show_head $testroot/repo`
986 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
987 1ebedb77 2019-10-19 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
988 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
990 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
991 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
992 1ebedb77 2019-10-19 stsp test_done "$testroot" "$ret"
996 1ebedb77 2019-10-19 stsp chmod +x $testroot/wt/alpha
998 1ebedb77 2019-10-19 stsp echo 'm alpha' > $testroot/stdout.expected
999 1ebedb77 2019-10-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
1001 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1003 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1004 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1006 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1009 f6cae3ed 2020-09-13 naddy commit_check_mode() {
1010 f7b97ccb 2020-04-14 stsp local mode="$1"
1011 f7b97ccb 2020-04-14 stsp local expected_mode="$2"
1013 f7b97ccb 2020-04-14 stsp chmod 644 $testroot/wt/alpha
1014 f7b97ccb 2020-04-14 stsp echo a >> $testroot/wt/alpha
1015 f7b97ccb 2020-04-14 stsp chmod $mode $testroot/wt/alpha
1017 f7b97ccb 2020-04-14 stsp (cd $testroot/wt && got commit -mm > $testroot/stdout)
1019 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1020 f7b97ccb 2020-04-14 stsp echo "got commit failed unexpectedly"
1021 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1025 f7b97ccb 2020-04-14 stsp local commit_id=`git_show_head $testroot/repo`
1026 f7b97ccb 2020-04-14 stsp echo 'M alpha' > $testroot/stdout.expected
1027 f7b97ccb 2020-04-14 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1028 f7b97ccb 2020-04-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1030 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1031 f7b97ccb 2020-04-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1032 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1036 f7b97ccb 2020-04-14 stsp local tree_id=$(got cat -r $testroot/repo $commit_id | \
1037 f7b97ccb 2020-04-14 stsp grep ^tree | cut -d' ' -f2)
1038 f7b97ccb 2020-04-14 stsp local alpha_id=$(got cat -r $testroot/repo $tree_id | \
1039 f7b97ccb 2020-04-14 stsp grep 'alpha$' | cut -d' ' -f1)
1040 f7b97ccb 2020-04-14 stsp echo "$alpha_id $expected_mode alpha" > $testroot/stdout.expected
1041 f7b97ccb 2020-04-14 stsp got cat -r $testroot/repo $tree_id | grep 'alpha$' > $testroot/stdout
1042 1ebedb77 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1044 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1045 1ebedb77 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1047 f7b97ccb 2020-04-14 stsp return $ret
1050 f6cae3ed 2020-09-13 naddy test_commit_normalizes_filemodes() {
1051 f7b97ccb 2020-04-14 stsp local testroot=`test_init commit_normalizes_filemodes`
1053 f7b97ccb 2020-04-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1055 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1056 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1060 f7b97ccb 2020-04-14 stsp modes="600 400 460 640 440 660 444 666"
1061 f7b97ccb 2020-04-14 stsp for m in $modes; do
1062 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100644"
1064 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1068 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1069 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1072 f7b97ccb 2020-04-14 stsp modes="700 500 570 750 550 770 555 777"
1073 f7b97ccb 2020-04-14 stsp for m in $modes; do
1074 f7b97ccb 2020-04-14 stsp commit_check_mode "$m" "0100755"
1076 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1080 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1081 f7b97ccb 2020-04-14 stsp test_done "$testroot" "$ret"
1084 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1087 f6cae3ed 2020-09-13 naddy test_commit_with_unrelated_submodule() {
1088 e7303626 2020-05-14 stsp local testroot=`test_init commit_with_unrelated_submodule`
1090 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1092 f1aec6ed 2022-10-24 stsp (cd $testroot/repo && git -c protocol.file.allow=always \
1093 f1aec6ed 2022-10-24 stsp submodule -q add ../repo2)
1094 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1096 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1098 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1099 7aadece8 2020-05-17 stsp echo "checkout failed unexpectedly" >&2
1100 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1104 e7303626 2020-05-14 stsp echo "modified alpha" > $testroot/wt/alpha
1106 7aadece8 2020-05-17 stsp echo "" > $testroot/stdout.expected
1108 74ad335c 2020-06-23 stsp (cd $testroot/wt && got commit -m 'modify alpha' > $testroot/stdout)
1110 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1111 7aadece8 2020-05-17 stsp echo "commit failed unexpectedly" >&2
1112 7aadece8 2020-05-17 stsp test_done "$testroot" "$ret"
1116 7aadece8 2020-05-17 stsp local head_rev=`git_show_head $testroot/repo`
1117 7aadece8 2020-05-17 stsp echo "M alpha" > $testroot/stdout.expected
1118 7aadece8 2020-05-17 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1120 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1122 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1123 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1125 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1128 f6cae3ed 2020-09-13 naddy check_symlinks() {
1129 bd6aa359 2020-07-23 stsp local wtpath="$1"
1130 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/alpha.link ]; then
1131 bd6aa359 2020-07-23 stsp echo "alpha.link is not a symlink"
1135 bd6aa359 2020-07-23 stsp readlink $wtpath/alpha.link > $testroot/stdout
1136 bd6aa359 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1137 bd6aa359 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1139 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1140 bd6aa359 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1144 bd6aa359 2020-07-23 stsp if ! [ -h $wtpath/epsilon.link ]; then
1145 bd6aa359 2020-07-23 stsp echo "epsilon.link is not a symlink"
1149 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon.link > $testroot/stdout
1150 bd6aa359 2020-07-23 stsp echo "epsilon" > $testroot/stdout.expected
1151 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1153 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1154 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1158 bd6aa359 2020-07-23 stsp if [ -h $wtpath/passwd.link ]; then
1159 bd6aa359 2020-07-23 stsp echo -n "passwd.link is a symlink and points outside of work tree: " >&2
1160 bd6aa359 2020-07-23 stsp readlink $wtpath/passwd.link >&2
1164 bd6aa359 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
1165 bd6aa359 2020-07-23 stsp cp $wtpath/passwd.link $testroot/content
1167 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1168 bd6aa359 2020-07-23 stsp echo "cp command failed unexpectedly" >&2
1172 bd6aa359 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
1174 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1175 bd6aa359 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
1179 bd6aa359 2020-07-23 stsp readlink $wtpath/epsilon/beta.link > $testroot/stdout
1180 bd6aa359 2020-07-23 stsp echo "../beta" > $testroot/stdout.expected
1181 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1183 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1184 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1188 bd6aa359 2020-07-23 stsp readlink $wtpath/nonexistent.link > $testroot/stdout
1189 bd6aa359 2020-07-23 stsp echo "nonexistent" > $testroot/stdout.expected
1190 7aadece8 2020-05-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1192 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1193 7aadece8 2020-05-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1200 f6cae3ed 2020-09-13 naddy test_commit_symlink() {
1201 bd6aa359 2020-07-23 stsp local testroot=`test_init commit_symlink`
1203 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1205 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1206 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1210 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s alpha alpha.link)
1211 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s epsilon epsilon.link)
1212 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1213 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s ../beta epsilon/beta.link)
1214 bd6aa359 2020-07-23 stsp (cd $testroot/wt && ln -s nonexistent nonexistent.link)
1215 bd6aa359 2020-07-23 stsp (cd $testroot/wt && got add alpha.link epsilon.link passwd.link \
1216 bd6aa359 2020-07-23 stsp epsilon/beta.link nonexistent.link > /dev/null)
1218 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1219 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1221 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1222 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1223 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1226 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/passwd.link: " > $testroot/stderr.expected
1227 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1228 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1229 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1231 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1232 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1233 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1237 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1238 35213c7c 2020-07-23 stsp > $testroot/stdout)
1240 bd6aa359 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1241 bd6aa359 2020-07-23 stsp echo "A alpha.link" > $testroot/stdout.expected
1242 bd6aa359 2020-07-23 stsp echo "A epsilon.link" >> $testroot/stdout.expected
1243 bd6aa359 2020-07-23 stsp echo "A nonexistent.link" >> $testroot/stdout.expected
1244 bd6aa359 2020-07-23 stsp echo "A passwd.link" >> $testroot/stdout.expected
1245 bd6aa359 2020-07-23 stsp echo "A epsilon/beta.link" >> $testroot/stdout.expected
1246 bd6aa359 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1248 3d9a4ec4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1250 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1251 3d9a4ec4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1252 3d9a4ec4 2020-07-23 stsp test_done "$testroot" "$ret"
1256 bd6aa359 2020-07-23 stsp # verify created in-repository tree
1257 bd6aa359 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1259 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1260 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1263 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt2
1265 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1266 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1270 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1271 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1272 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1276 75f0a0fb 2020-07-23 stsp # 'got update' should reinstall passwd.link as a regular file
1277 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
1278 bd6aa359 2020-07-23 stsp check_symlinks $testroot/wt
1280 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1281 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1285 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
1286 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sfh gamma epsilon.link)
1287 88fb31d4 2020-07-23 stsp rm $testroot/wt/epsilon/beta.link
1288 88fb31d4 2020-07-23 stsp echo "this is a regular file" > $testroot/wt/epsilon/beta.link
1289 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
1290 35213c7c 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
1291 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
1292 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
1293 88fb31d4 2020-07-23 stsp (cd $testroot/wt && ln -sf alpha new.link)
1294 88fb31d4 2020-07-23 stsp (cd $testroot/wt && got add new.link > /dev/null)
1296 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -m 'test commit_symlink' \
1297 35213c7c 2020-07-23 stsp > $testroot/stdout 2> $testroot/stderr)
1299 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1300 35213c7c 2020-07-23 stsp echo "got commit succeeded unexpectedly" >&2
1301 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1304 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
1305 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
1306 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
1307 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1309 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1310 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
1311 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
1315 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1316 35213c7c 2020-07-23 stsp > $testroot/stdout)
1318 88fb31d4 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1319 35213c7c 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
1320 35213c7c 2020-07-23 stsp echo "A new.link" >> $testroot/stdout.expected
1321 88fb31d4 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
1322 88fb31d4 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
1323 88fb31d4 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
1324 88fb31d4 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
1325 88fb31d4 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1327 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1329 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1330 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1331 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1335 88fb31d4 2020-07-23 stsp got tree -r $testroot/repo -c $head_rev -R > $testroot/stdout
1336 88fb31d4 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
1338 88fb31d4 2020-07-23 stsp alpha.link@ -> beta
1340 35213c7c 2020-07-23 stsp dotgotbar.link@ -> .got/bar
1342 88fb31d4 2020-07-23 stsp epsilon/beta.link
1343 88fb31d4 2020-07-23 stsp epsilon/zeta
1344 88fb31d4 2020-07-23 stsp epsilon.link@ -> gamma
1346 88fb31d4 2020-07-23 stsp gamma/delta
1347 88fb31d4 2020-07-23 stsp new.link@ -> alpha
1348 88fb31d4 2020-07-23 stsp passwd.link@ -> /etc/passwd
1350 88fb31d4 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1352 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1353 88fb31d4 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1355 88fb31d4 2020-07-23 stsp test_done "$testroot" "$ret"
1358 f6cae3ed 2020-09-13 naddy test_commit_fix_bad_symlink() {
1359 5a1fbc73 2020-07-23 stsp local testroot=`test_init commit_fix_bad_symlink`
1361 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1363 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1364 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1365 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1369 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
1370 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got add passwd.link > /dev/null)
1372 35213c7c 2020-07-23 stsp (cd $testroot/wt && got commit -S -m 'commit bad symlink' \
1373 35213c7c 2020-07-23 stsp > $testroot/stdout)
1375 75f0a0fb 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1376 75f0a0fb 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1377 75f0a0fb 2020-07-23 stsp test_done "$testroot" 1
1380 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update >/dev/null)
1381 5a1fbc73 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
1382 5a1fbc73 2020-07-23 stsp echo "passwd.link is a symlink but should be a regular file" >&2
1383 5a1fbc73 2020-07-23 stsp test_done "$testroot" "1"
1387 5a1fbc73 2020-07-23 stsp # create another work tree which will contain the "bad" symlink
1388 5a1fbc73 2020-07-23 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
1390 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1391 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1392 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1396 5a1fbc73 2020-07-23 stsp # change "bad" symlink back into a "good" symlink
1397 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && ln -sfh alpha passwd.link)
1399 5a1fbc73 2020-07-23 stsp (cd $testroot/wt && got commit -m 'fix bad symlink' \
1400 5a1fbc73 2020-07-23 stsp > $testroot/stdout)
1402 5a1fbc73 2020-07-23 stsp local head_rev=`git_show_head $testroot/repo`
1403 5a1fbc73 2020-07-23 stsp echo "M passwd.link" > $testroot/stdout.expected
1404 5a1fbc73 2020-07-23 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1406 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1408 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1409 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1410 bd6aa359 2020-07-23 stsp test_done "$testroot" "$ret"
1414 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt/passwd.link ]; then
1415 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1416 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1420 5a1fbc73 2020-07-23 stsp readlink $testroot/wt/passwd.link > $testroot/stdout
1421 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1422 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1424 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1425 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1429 5a1fbc73 2020-07-23 stsp # Update the other work tree; the bad symlink should be fixed
1430 5a1fbc73 2020-07-23 stsp (cd $testroot/wt2 && got update > /dev/null)
1432 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1433 5a1fbc73 2020-07-23 stsp echo "got checkout failed unexpectedly" >&2
1434 5a1fbc73 2020-07-23 stsp test_done "$testroot" "$ret"
1438 5a1fbc73 2020-07-23 stsp if ! [ -h $testroot/wt2/passwd.link ]; then
1439 5a1fbc73 2020-07-23 stsp echo 'passwd.link is not a symlink' >&2
1440 5a1fbc73 2020-07-23 stsp test_done "$testroot" 1
1444 5a1fbc73 2020-07-23 stsp readlink $testroot/wt2/passwd.link > $testroot/stdout
1445 5a1fbc73 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1446 5a1fbc73 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1448 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1449 5a1fbc73 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1453 bd6aa359 2020-07-23 stsp test_done "$testroot" "0"
1456 28cf319f 2021-01-28 stsp test_commit_prepared_logmsg() {
1457 28cf319f 2021-01-28 stsp local testroot=`test_init commit_prepared_logmsg`
1459 28cf319f 2021-01-28 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1461 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1462 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1466 28cf319f 2021-01-28 stsp echo "modified alpha" > $testroot/wt/alpha
1467 28cf319f 2021-01-28 stsp (cd $testroot/wt && got rm beta >/dev/null)
1468 28cf319f 2021-01-28 stsp echo "new file" > $testroot/wt/new
1469 28cf319f 2021-01-28 stsp (cd $testroot/wt && got add new >/dev/null)
1471 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg' > $testroot/logmsg
1473 28cf319f 2021-01-28 stsp cat > $testroot/editor.sh <<EOF
1475 28cf319f 2021-01-28 stsp sed -i 's/foo/bar/' "\$1"
1477 28cf319f 2021-01-28 stsp chmod +x $testroot/editor.sh
1479 8e09a168 2021-06-17 tracey (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1480 28cf319f 2021-01-28 stsp got commit -F "$testroot/logmsg" > $testroot/stdout)
1482 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1483 28cf319f 2021-01-28 stsp echo "A new" > $testroot/stdout.expected
1484 28cf319f 2021-01-28 stsp echo "M alpha" >> $testroot/stdout.expected
1485 28cf319f 2021-01-28 stsp echo "D beta" >> $testroot/stdout.expected
1486 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1488 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1490 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1491 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1492 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1496 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1497 3a6b8760 2021-08-31 naddy d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1498 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" > $testroot/stdout.expected
1499 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1500 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1501 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1502 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1503 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg" >> $testroot/stdout.expected
1504 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1506 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1507 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1509 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1510 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1511 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1515 28cf319f 2021-01-28 stsp echo "modified alpha again" > $testroot/wt/alpha
1517 28cf319f 2021-01-28 stsp echo 'test commit_prepared_logmsg non-interactive' \
1518 28cf319f 2021-01-28 stsp > $testroot/logmsg
1520 28cf319f 2021-01-28 stsp (cd $testroot/wt && got commit -N -F "$testroot/logmsg" \
1521 28cf319f 2021-01-28 stsp > $testroot/stdout)
1523 28cf319f 2021-01-28 stsp local head_rev=`git_show_head $testroot/repo`
1524 28cf319f 2021-01-28 stsp echo "M alpha" > $testroot/stdout.expected
1525 28cf319f 2021-01-28 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1527 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1529 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1530 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1531 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1535 28cf319f 2021-01-28 stsp local author_time=`git_show_author_time $testroot/repo`
1536 3a6b8760 2021-08-31 naddy d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1537 28cf319f 2021-01-28 stsp echo "-----------------------------------------------" \
1538 28cf319f 2021-01-28 stsp > $testroot/stdout.expected
1539 28cf319f 2021-01-28 stsp echo "commit $head_rev (master)" >> $testroot/stdout.expected
1540 28cf319f 2021-01-28 stsp echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1541 28cf319f 2021-01-28 stsp echo "date: $d" >> $testroot/stdout.expected
1542 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1543 28cf319f 2021-01-28 stsp echo " test commit_prepared_logmsg non-interactive" \
1544 28cf319f 2021-01-28 stsp >> $testroot/stdout.expected
1545 28cf319f 2021-01-28 stsp echo " " >> $testroot/stdout.expected
1547 28cf319f 2021-01-28 stsp (cd $testroot/wt && got log -l 1 > $testroot/stdout)
1548 28cf319f 2021-01-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1550 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1551 28cf319f 2021-01-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1553 28cf319f 2021-01-28 stsp test_done "$testroot" "$ret"
1556 72840534 2022-01-19 stsp test_commit_large_file() {
1557 72840534 2022-01-19 stsp local testroot=`test_init commit_large_file`
1559 72840534 2022-01-19 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1561 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1562 72840534 2022-01-19 stsp test_done "$testroot" "$ret"
1566 230e1f1b 2022-07-05 stsp dd status=none if=/dev/zero of=$testroot/wt/new bs=1M count=64
1567 72840534 2022-01-19 stsp (cd $testroot/wt && got add new >/dev/null)
1569 72840534 2022-01-19 stsp (cd $testroot/wt && got commit -m 'test commit_large_file' \
1570 72840534 2022-01-19 stsp > $testroot/stdout)
1572 72840534 2022-01-19 stsp local head_rev=`git_show_head $testroot/repo`
1573 72840534 2022-01-19 stsp echo "A new" > $testroot/stdout.expected
1574 72840534 2022-01-19 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1576 72840534 2022-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1578 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1579 72840534 2022-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1580 72840534 2022-01-19 stsp test_done "$testroot" "$ret"
1584 72840534 2022-01-19 stsp new_id=`get_blob_id $testroot/repo "" new`
1585 72840534 2022-01-19 stsp got cat -r $testroot/repo $new_id > $testroot/new
1587 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1588 72840534 2022-01-19 stsp echo "commit failed unexpectedly" >&2
1589 72840534 2022-01-19 stsp test_done "$testroot" "1"
1593 72840534 2022-01-19 stsp cmp -s $testroot/new $testroot/wt/new
1595 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1596 72840534 2022-01-19 stsp diff -u $testroot/new $testroot/wt/new
1598 72840534 2022-01-19 stsp test_done "$testroot" "$ret"
1603 4ba2e955 2022-09-02 sh+got test_commit_gitignore() {
1604 4ba2e955 2022-09-02 sh+got local testroot=`test_init commit_gitignores`
1606 4ba2e955 2022-09-02 sh+got got checkout $testroot/repo $testroot/wt > /dev/null
1608 4ba2e955 2022-09-02 sh+got if [ $ret -ne 0 ]; then
1609 4ba2e955 2022-09-02 sh+got test_done "$testroot" "$ret"
1610 4ba2e955 2022-09-02 sh+got return 1
1613 4ba2e955 2022-09-02 sh+got mkdir -p $testroot/wt/tree1/foo
1614 4ba2e955 2022-09-02 sh+got mkdir -p $testroot/wt/tree2/foo
1615 4ba2e955 2022-09-02 sh+got echo "tree1/**" > $testroot/wt/.gitignore
1616 4ba2e955 2022-09-02 sh+got echo "tree2/**" >> $testroot/wt/.gitignore
1617 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/tree1/bar
1618 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/tree1/foo/baz
1619 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/tree2/bar
1620 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/tree2/foo/baz
1621 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/epsilon/zeta1
1622 4ba2e955 2022-09-02 sh+got echo -n > $testroot/wt/epsilon/zeta2
1624 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got add -I -R tree1 > /dev/null)
1625 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got add -I tree2/foo/baz > /dev/null)
1626 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got commit -m "gitignore add" > /dev/null)
1627 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1629 4ba2e955 2022-09-02 sh+got echo ' gitignore add' > $testroot/stdout.expected
1630 4ba2e955 2022-09-02 sh+got echo ' A tree1/bar' >> $testroot/stdout.expected
1631 4ba2e955 2022-09-02 sh+got echo ' A tree1/foo/baz' >> $testroot/stdout.expected
1632 4ba2e955 2022-09-02 sh+got echo ' A tree2/foo/baz' >> $testroot/stdout.expected
1634 4ba2e955 2022-09-02 sh+got cmp -s $testroot/stdout.expected $testroot/stdout
1636 4ba2e955 2022-09-02 sh+got if [ $ret -ne 0 ]; then
1637 4ba2e955 2022-09-02 sh+got diff -u $testroot/stdout.expected $testroot/stdout
1638 4ba2e955 2022-09-02 sh+got test_done "$testroot" "$ret"
1639 4ba2e955 2022-09-02 sh+got return 1
1642 4ba2e955 2022-09-02 sh+got echo touch > $testroot/wt/tree1/bar
1643 4ba2e955 2022-09-02 sh+got echo touch > $testroot/wt/tree1/foo/baz
1644 4ba2e955 2022-09-02 sh+got echo touch > $testroot/wt/epsilon/zeta1
1646 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got commit -m "gitignore change" > /dev/null)
1647 4ba2e955 2022-09-02 sh+got (cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1649 4ba2e955 2022-09-02 sh+got echo ' gitignore change' > $testroot/stdout.expected
1650 4ba2e955 2022-09-02 sh+got echo ' M tree1/bar' >> $testroot/stdout.expected
1651 4ba2e955 2022-09-02 sh+got echo ' M tree1/foo/baz' >> $testroot/stdout.expected
1653 4ba2e955 2022-09-02 sh+got cmp -s $testroot/stdout.expected $testroot/stdout
1655 4ba2e955 2022-09-02 sh+got if [ $ret -ne 0 ]; then
1656 4ba2e955 2022-09-02 sh+got diff -u $testroot/stdout.expected $testroot/stdout
1657 4ba2e955 2022-09-02 sh+got test_done "$testroot" "$ret"
1658 4ba2e955 2022-09-02 sh+got return 1
1661 4ba2e955 2022-09-02 sh+got test_done "$testroot" "$ret"
1664 21f07726 2022-10-31 stsp test_commit_bad_author() {
1665 21f07726 2022-10-31 stsp local testroot=`test_init commit_bad_author`
1667 21f07726 2022-10-31 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1669 21f07726 2022-10-31 stsp if [ $ret -ne 0 ]; then
1670 21f07726 2022-10-31 stsp test_done "$testroot" $ret
1674 21f07726 2022-10-31 stsp echo "modified alpha" > $testroot/wt/alpha
1676 21f07726 2022-10-31 stsp (cd $testroot/wt && got commit \
1677 21f07726 2022-10-31 stsp -A "${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>" -m 'edit alpha') \
1678 21f07726 2022-10-31 stsp > /dev/null 2> $testroot/stderr
1680 21f07726 2022-10-31 stsp if [ $ret -eq 0 ]; then
1681 21f07726 2022-10-31 stsp test_done "$testroot" 1
1685 21f07726 2022-10-31 stsp echo -n "got: ${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>: " \
1686 21f07726 2022-10-31 stsp > $testroot/stderr.expected
1687 21f07726 2022-10-31 stsp echo -n 'space between author name and email required: ' \
1688 21f07726 2022-10-31 stsp >> $testroot/stderr.expected
1689 21f07726 2022-10-31 stsp echo 'commit author formatting would make Git unhappy' \
1690 21f07726 2022-10-31 stsp >> $testroot/stderr.expected
1691 21f07726 2022-10-31 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1693 21f07726 2022-10-31 stsp if [ $ret -ne 0 ]; then
1694 21f07726 2022-10-31 stsp diff -u $testroot/stderr.expected $testroot/stderr
1695 21f07726 2022-10-31 stsp test_done "$testroot" $ret
1699 21f07726 2022-10-31 stsp test_done "$testroot" 0
1702 def2bea2 2023-01-30 mark test_commit_logmsg_ref() {
1703 def2bea2 2023-01-30 mark local testroot=`test_init commit_logmsg_ref`
1705 def2bea2 2023-01-30 mark got checkout $testroot/repo $testroot/wt > /dev/null
1707 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1708 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1712 def2bea2 2023-01-30 mark (cd $testroot/repo && git checkout -q -b newbranch)
1714 def2bea2 2023-01-30 mark local bo_logmsg_prefix="log message of backed-out commit"
1715 def2bea2 2023-01-30 mark local cy_logmsg_prefix="log message of cherrypicked commit"
1716 def2bea2 2023-01-30 mark local branch_rev_logmsg="changes on newbranch to cherrypick"
1717 def2bea2 2023-01-30 mark local branch_rev2_logmsg="modified zeta on newbranch to cherrypick"
1719 def2bea2 2023-01-30 mark echo "modified delta on branch" > $testroot/repo/gamma/delta
1720 def2bea2 2023-01-30 mark echo "modified alpha on branch" > $testroot/repo/alpha
1721 def2bea2 2023-01-30 mark (cd $testroot/repo && git rm -q beta)
1722 def2bea2 2023-01-30 mark echo "new file on branch" > $testroot/repo/epsilon/new
1723 def2bea2 2023-01-30 mark (cd $testroot/repo && git add epsilon/new)
1725 def2bea2 2023-01-30 mark git_commit $testroot/repo -m "$branch_rev_logmsg"
1726 def2bea2 2023-01-30 mark local branch_rev=`git_show_head $testroot/repo`
1728 def2bea2 2023-01-30 mark echo "modified zeta on branch" > $testroot/repo/epsilon/zeta
1730 def2bea2 2023-01-30 mark git_commit $testroot/repo -m "$branch_rev2_logmsg"
1731 def2bea2 2023-01-30 mark local branch_rev2=`git_show_head $testroot/repo`
1733 def2bea2 2023-01-30 mark (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1734 def2bea2 2023-01-30 mark (cd $testroot/wt && got cherrypick $branch_rev2 > /dev/null)
1736 def2bea2 2023-01-30 mark cat > $testroot/editor.sh <<EOF
1738 def2bea2 2023-01-30 mark sed -i 's/# l/l/' "\$1"
1740 def2bea2 2023-01-30 mark chmod +x $testroot/editor.sh
1742 def2bea2 2023-01-30 mark (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1743 def2bea2 2023-01-30 mark got commit > /dev/null)
1745 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1746 def2bea2 2023-01-30 mark echo "'got commit' failed unexpectedly" >&2
1747 def2bea2 2023-01-30 mark test_done "$testroot" "1"
1751 def2bea2 2023-01-30 mark # check that multiple cherrypicked log messages populate the editor
1752 def2bea2 2023-01-30 mark local first=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | head -1`
1753 def2bea2 2023-01-30 mark local second=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | tail -1`
1755 def2bea2 2023-01-30 mark if [ $branch_rev == $first ]; then
1756 def2bea2 2023-01-30 mark local first_msg=$branch_rev_logmsg
1757 def2bea2 2023-01-30 mark local second_msg=$branch_rev2_logmsg
1759 def2bea2 2023-01-30 mark local first_msg=$branch_rev2_logmsg
1760 def2bea2 2023-01-30 mark local second_msg=$branch_rev_logmsg
1763 def2bea2 2023-01-30 mark echo " $cy_logmsg_prefix $first:" > $testroot/stdout.expected
1764 def2bea2 2023-01-30 mark echo " $first_msg" >> $testroot/stdout.expected
1765 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1766 def2bea2 2023-01-30 mark echo " $cy_logmsg_prefix $second:" >> $testroot/stdout.expected
1767 def2bea2 2023-01-30 mark echo " $second_msg" >> $testroot/stdout.expected
1768 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1770 def2bea2 2023-01-30 mark (cd $testroot/wt && got log -l2 | \
1771 def2bea2 2023-01-30 mark grep -A2 'log message' | sed '/^--/d' > $testroot/stdout)
1773 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1775 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1776 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1777 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1781 def2bea2 2023-01-30 mark # check that only the relevant log message populates the editor
1782 def2bea2 2023-01-30 mark # when the changes from one of two backout commits are reverted
1783 def2bea2 2023-01-30 mark got checkout $testroot/repo $testroot/wt2 > /dev/null
1785 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1786 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1790 def2bea2 2023-01-30 mark (cd $testroot/wt2 && got backout $branch_rev > /dev/null)
1791 def2bea2 2023-01-30 mark (cd $testroot/wt2 && got backout $branch_rev2 > /dev/null)
1792 def2bea2 2023-01-30 mark (cd $testroot/wt2 && got revert epsilon/zeta > /dev/null)
1794 def2bea2 2023-01-30 mark (cd $testroot/wt2 && env VISUAL="$testroot/editor.sh" \
1795 def2bea2 2023-01-30 mark got commit > /dev/null)
1797 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1798 def2bea2 2023-01-30 mark echo "'got commit' failed unexpectedly" >&2
1799 def2bea2 2023-01-30 mark test_done "$testroot" "1"
1803 def2bea2 2023-01-30 mark echo " $bo_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1804 def2bea2 2023-01-30 mark echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1805 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1807 def2bea2 2023-01-30 mark (cd $testroot/wt2 && got log -l1 | \
1808 def2bea2 2023-01-30 mark grep -A2 'log message' > $testroot/stdout)
1810 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1812 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1813 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1814 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1818 def2bea2 2023-01-30 mark # check that a cherrypicked log message is still
1819 def2bea2 2023-01-30 mark # used when its changes are only partially reverted
1820 def2bea2 2023-01-30 mark branch_rev_logmsg="changes to cherrypick and partially revert"
1822 def2bea2 2023-01-30 mark echo "newline in alpha" >> $testroot/repo/alpha
1823 def2bea2 2023-01-30 mark echo "modified epsilon/zeta on branch" > $testroot/repo/epsilon/zeta
1825 def2bea2 2023-01-30 mark git_commit $testroot/repo -m "$branch_rev_logmsg"
1826 def2bea2 2023-01-30 mark branch_rev=`git_show_head $testroot/repo`
1828 def2bea2 2023-01-30 mark (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1829 def2bea2 2023-01-30 mark (cd $testroot/wt && got revert alpha > /dev/null)
1831 def2bea2 2023-01-30 mark (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1832 def2bea2 2023-01-30 mark got commit > /dev/null)
1834 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1835 def2bea2 2023-01-30 mark echo "'got commit' failed unexpectedly" >&2
1836 def2bea2 2023-01-30 mark test_done "$testroot" "1"
1840 def2bea2 2023-01-30 mark echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1841 def2bea2 2023-01-30 mark echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1842 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1844 def2bea2 2023-01-30 mark (cd $testroot/wt && got log -l1 | \
1845 def2bea2 2023-01-30 mark grep -A2 'log message' > $testroot/stdout)
1847 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1849 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1850 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1851 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1855 def2bea2 2023-01-30 mark # check we don't use and consequently delete the logmsg ref of a
1856 def2bea2 2023-01-30 mark # cherrypicked commit when omitting its changed path from the commit
1857 def2bea2 2023-01-30 mark branch_rev_logmsg="changes to cherrypick but omit from the commit"
1859 def2bea2 2023-01-30 mark echo "changed delta" >> $testroot/repo/gamma/delta
1861 def2bea2 2023-01-30 mark git_commit $testroot/repo -m "$branch_rev_logmsg"
1862 def2bea2 2023-01-30 mark local author_time=`git_show_author_time $testroot/repo`
1863 def2bea2 2023-01-30 mark local d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1864 def2bea2 2023-01-30 mark branch_rev=`git_show_head $testroot/repo`
1866 def2bea2 2023-01-30 mark (cd $testroot/wt && got update > /dev/null)
1868 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1869 def2bea2 2023-01-30 mark echo "got update failed unexpectedly" >&2
1870 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1874 def2bea2 2023-01-30 mark (cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1876 def2bea2 2023-01-30 mark echo "changed alpha" >> $testroot/wt/alpha
1878 def2bea2 2023-01-30 mark (cd $testroot/wt && got commit -m \
1879 def2bea2 2023-01-30 mark "don't commit cy change to gamma/delta" alpha > /dev/null)
1881 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1882 def2bea2 2023-01-30 mark echo "'got commit' failed unexpectedly" >&2
1883 def2bea2 2023-01-30 mark test_done "$testroot" "1"
1887 def2bea2 2023-01-30 mark # confirm logmsg ref was not deleted with got cherrypick -l
1888 def2bea2 2023-01-30 mark echo "-----------------------------------------------" \
1889 def2bea2 2023-01-30 mark > $testroot/stdout.expected
1890 b584caa3 2023-01-30 mark echo "cherrypick $branch_rev (newbranch)" >> $testroot/stdout.expected
1891 def2bea2 2023-01-30 mark echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1892 def2bea2 2023-01-30 mark echo "date: $d" >> $testroot/stdout.expected
1893 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1894 def2bea2 2023-01-30 mark echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1895 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1896 def2bea2 2023-01-30 mark echo " M gamma/delta" >> $testroot/stdout.expected
1897 def2bea2 2023-01-30 mark echo >> $testroot/stdout.expected
1899 def2bea2 2023-01-30 mark (cd $testroot/wt && got cherrypick -l > $testroot/stdout)
1901 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1903 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1904 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1905 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1909 def2bea2 2023-01-30 mark # confirm a previously unused logmsg ref is picked up
1910 def2bea2 2023-01-30 mark # when an affected path is actually committed
1911 def2bea2 2023-01-30 mark (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1912 def2bea2 2023-01-30 mark got commit > /dev/null)
1914 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1915 def2bea2 2023-01-30 mark echo "'got commit' failed unexpectedly" >&2
1916 def2bea2 2023-01-30 mark test_done "$testroot" "1"
1920 def2bea2 2023-01-30 mark echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1921 def2bea2 2023-01-30 mark echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1922 def2bea2 2023-01-30 mark echo " " >> $testroot/stdout.expected
1924 def2bea2 2023-01-30 mark (cd $testroot/wt && got log -l1 | \
1925 def2bea2 2023-01-30 mark grep -A2 'log message' > $testroot/stdout)
1927 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1929 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1930 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1931 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1935 def2bea2 2023-01-30 mark # make sure we are not littering work trees
1936 def2bea2 2023-01-30 mark # by leaving temp got-logmsg-* files behind
1937 def2bea2 2023-01-30 mark echo -n > $testroot/stdout.expected
1938 def2bea2 2023-01-30 mark (cd $testroot/wt && got status > $testroot/stdout)
1940 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1942 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1943 def2bea2 2023-01-30 mark echo "$testroot/wt is not clean"
1944 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1945 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1949 def2bea2 2023-01-30 mark (cd $testroot/wt2 && got status > $testroot/stdout)
1951 def2bea2 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
1953 def2bea2 2023-01-30 mark if [ $ret -ne 0 ]; then
1954 def2bea2 2023-01-30 mark echo "$testroot/repo is not clean"
1955 def2bea2 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
1957 def2bea2 2023-01-30 mark test_done "$testroot" "$ret"
1960 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1961 c4296144 2019-05-09 stsp run_test test_commit_basic
1962 83a7ae6d 2019-05-10 stsp run_test test_commit_new_subdir
1963 83a7ae6d 2019-05-10 stsp run_test test_commit_subdir
1964 83a7ae6d 2019-05-10 stsp run_test test_commit_single_file
1965 83a7ae6d 2019-05-10 stsp run_test test_commit_out_of_date
1966 8ba6ba2d 2019-05-14 stsp run_test test_commit_added_subdirs
1967 ba580f68 2020-03-22 stsp run_test test_commit_deleted_subdirs
1968 f363d663 2019-05-23 stsp run_test test_commit_rejects_conflicted_file
1969 1a36436d 2019-06-10 stsp run_test test_commit_single_file_multiple
1970 4866d084 2019-07-10 stsp run_test test_commit_added_and_modified_in_same_dir
1971 e0233cea 2019-07-25 stsp run_test test_commit_path_prefix
1972 90e8619e 2019-07-25 stsp run_test test_commit_dir_path
1973 5c1e53bc 2019-07-28 stsp run_test test_commit_selected_paths
1974 916f288c 2019-07-30 stsp run_test test_commit_outside_refs_heads
1975 84792843 2019-08-09 stsp run_test test_commit_no_email
1976 6af1ccbd 2019-08-16 stsp run_test test_commit_tree_entry_sorting
1977 62b21d33 2022-07-19 op run_test test_commit_cmdline_author
1978 257add31 2020-09-09 stsp run_test test_commit_gotconfig_author
1979 50b0790e 2020-09-11 stsp run_test test_commit_gotconfig_worktree_author
1980 aba9c984 2019-09-08 stsp run_test test_commit_gitconfig_author
1981 1ebedb77 2019-10-19 stsp run_test test_commit_xbit_change
1982 f7b97ccb 2020-04-14 stsp run_test test_commit_normalizes_filemodes
1983 e7303626 2020-05-14 stsp run_test test_commit_with_unrelated_submodule
1984 3d9a4ec4 2020-07-23 stsp run_test test_commit_symlink
1985 5a1fbc73 2020-07-23 stsp run_test test_commit_fix_bad_symlink
1986 28cf319f 2021-01-28 stsp run_test test_commit_prepared_logmsg
1987 72840534 2022-01-19 stsp run_test test_commit_large_file
1988 4ba2e955 2022-09-02 sh+got run_test test_commit_gitignore
1989 21f07726 2022-10-31 stsp run_test test_commit_bad_author
1990 def2bea2 2023-01-30 mark run_test test_commit_logmsg_ref
