]>
Commit | Line | Data |
---|---|---|
b468f0ce JH |
1 | #!/bin/sh |
2 | ||
3 | test_description='git commit porcelain-ish' | |
4 | ||
1e2ae142 | 5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
334afbc7 JS |
6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
7 | ||
b468f0ce JH |
8 | . ./test-lib.sh |
9 | ||
51fb3a3d RT |
10 | commit_msg_is () { |
11 | expect=commit_msg_is.expect | |
12 | actual=commit_msg_is.actual | |
13 | ||
14 | printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual && | |
15 | printf "%s" "$1" >$expect && | |
1108cea7 | 16 | test_cmp $expect $actual |
51fb3a3d RT |
17 | } |
18 | ||
cee9f2b3 | 19 | # Arguments: [<prefix] [<commit message>] [<commit options>] |
fc6fa0d0 TRC |
20 | check_summary_oneline() { |
21 | test_tick && | |
94ca361b DL |
22 | git commit ${3+"$3"} -m "$2" >raw && |
23 | head -n 1 raw >act && | |
fc6fa0d0 TRC |
24 | |
25 | # branch name | |
26 | SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" && | |
27 | ||
28 | # append the "special" prefix, like "root-commit", "detached HEAD" | |
29 | if test -n "$1" | |
30 | then | |
31 | SUMMARY_PREFIX="$SUMMARY_PREFIX ($1)" | |
32 | fi | |
33 | ||
34 | # abbrev SHA-1 | |
35 | SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')" | |
36 | echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp && | |
37 | ||
1108cea7 | 38 | test_cmp exp act |
fc6fa0d0 TRC |
39 | } |
40 | ||
2daae3d1 ZH |
41 | trailer_commit_base () { |
42 | echo "fun" >>file && | |
43 | git add file && | |
44 | git commit -s --trailer "Signed-off-by=C1 E1 " \ | |
45 | --trailer "Helped-by:C2 E2 " \ | |
46 | --trailer "Reported-by=C3 E3" \ | |
47 | --trailer "Mentored-by:C4 E4" \ | |
48 | -m "hello" | |
49 | } | |
50 | ||
fc6fa0d0 TRC |
51 | test_expect_success 'output summary format' ' |
52 | ||
53 | echo new >file1 && | |
54 | git add file1 && | |
55 | check_summary_oneline "root-commit" "initial" && | |
56 | ||
57 | echo change >>file1 && | |
7f5673d7 ÆAB |
58 | git add file1 |
59 | ' | |
60 | ||
61 | test_expect_success 'output summary format: root-commit' ' | |
fc6fa0d0 TRC |
62 | check_summary_oneline "" "a change" |
63 | ' | |
64 | ||
a45e1a87 | 65 | test_expect_success 'output summary format for commit with an empty diff' ' |
cee9f2b3 TRC |
66 | |
67 | check_summary_oneline "" "empty" "--allow-empty" | |
68 | ' | |
69 | ||
a45e1a87 | 70 | test_expect_success 'output summary format for merges' ' |
cee9f2b3 TRC |
71 | |
72 | git checkout -b recursive-base && | |
73 | test_commit base file1 && | |
74 | ||
75 | git checkout -b recursive-a recursive-base && | |
76 | test_commit commit-a file1 && | |
77 | ||
78 | git checkout -b recursive-b recursive-base && | |
79 | test_commit commit-b file1 && | |
80 | ||
81 | # conflict | |
82 | git checkout recursive-a && | |
83 | test_must_fail git merge recursive-b && | |
84 | # resolve the conflict | |
94ca361b | 85 | echo commit-a >file1 && |
cee9f2b3 TRC |
86 | git add file1 && |
87 | check_summary_oneline "" "Merge" | |
88 | ' | |
89 | ||
fc6fa0d0 TRC |
90 | output_tests_cleanup() { |
91 | # this is needed for "do not fire editor in the presence of conflicts" | |
1e2ae142 | 92 | git checkout main && |
fc6fa0d0 TRC |
93 | |
94 | # this is needed for the "partial removal" test to pass | |
95 | git rm file1 && | |
96 | git commit -m "cleanup" | |
97 | } | |
98 | ||
b468f0ce JH |
99 | test_expect_success 'the basics' ' |
100 | ||
fc6fa0d0 TRC |
101 | output_tests_cleanup && |
102 | ||
b468f0ce JH |
103 | echo doing partial >"commit is" && |
104 | mkdir not && | |
105 | echo very much encouraged but we should >not/forbid && | |
106 | git add "commit is" not && | |
107 | echo update added "commit is" file >"commit is" && | |
108 | echo also update another >not/forbid && | |
109 | test_tick && | |
110 | git commit -a -m "initial with -a" && | |
111 | ||
112 | git cat-file blob HEAD:"commit is" >current.1 && | |
113 | git cat-file blob HEAD:not/forbid >current.2 && | |
114 | ||
115 | cmp current.1 "commit is" && | |
116 | cmp current.2 not/forbid | |
117 | ||
118 | ' | |
119 | ||
120 | test_expect_success 'partial' ' | |
121 | ||
122 | echo another >"commit is" && | |
123 | echo another >not/forbid && | |
124 | test_tick && | |
125 | git commit -m "partial commit to handle a file" "commit is" && | |
126 | ||
127 | changed=$(git diff-tree --name-only HEAD^ HEAD) && | |
128 | test "$changed" = "commit is" | |
129 | ||
130 | ' | |
131 | ||
e8f30160 | 132 | test_expect_success 'partial modification in a subdirectory' ' |
b468f0ce JH |
133 | |
134 | test_tick && | |
135 | git commit -m "partial commit to subdirectory" not && | |
136 | ||
137 | changed=$(git diff-tree -r --name-only HEAD^ HEAD) && | |
138 | test "$changed" = "not/forbid" | |
139 | ||
140 | ' | |
141 | ||
142 | test_expect_success 'partial removal' ' | |
143 | ||
144 | git rm not/forbid && | |
145 | git commit -m "partial commit to remove not/forbid" not && | |
146 | ||
147 | changed=$(git diff-tree -r --name-only HEAD^ HEAD) && | |
148 | test "$changed" = "not/forbid" && | |
149 | remain=$(git ls-tree -r --name-only HEAD) && | |
150 | test "$remain" = "commit is" | |
151 | ||
152 | ' | |
153 | ||
154 | test_expect_success 'sign off' ' | |
155 | ||
156 | >positive && | |
157 | git add positive && | |
158 | git commit -s -m "thank you" && | |
94ca361b DL |
159 | git cat-file commit HEAD >commit.msg && |
160 | sed -ne "s/Signed-off-by: //p" commit.msg >actual && | |
161 | git var GIT_COMMITTER_IDENT >ident && | |
162 | sed -e "s/>.*/>/" ident >expected && | |
163 | test_cmp expected actual | |
b468f0ce JH |
164 | |
165 | ' | |
166 | ||
2daae3d1 ZH |
167 | test_expect_success 'commit --trailer with "="' ' |
168 | trailer_commit_base && | |
169 | cat >expected <<-\EOF && | |
170 | hello | |
171 | ||
172 | Signed-off-by: C O Mitter <committer@example.com> | |
173 | Signed-off-by: C1 E1 | |
174 | Helped-by: C2 E2 | |
175 | Reported-by: C3 E3 | |
176 | Mentored-by: C4 E4 | |
177 | EOF | |
178 | git cat-file commit HEAD >commit.msg && | |
179 | sed -e "1,/^\$/d" commit.msg >actual && | |
180 | test_cmp expected actual | |
181 | ' | |
182 | ||
183 | test_expect_success 'commit --trailer with -c and "replace" as ifexists' ' | |
184 | trailer_commit_base && | |
185 | cat >expected <<-\EOF && | |
186 | hello | |
187 | ||
188 | Signed-off-by: C O Mitter <committer@example.com> | |
189 | Signed-off-by: C1 E1 | |
190 | Reported-by: C3 E3 | |
191 | Mentored-by: C4 E4 | |
192 | Helped-by: C3 E3 | |
193 | EOF | |
194 | git -c trailer.ifexists="replace" \ | |
195 | commit --trailer "Mentored-by: C4 E4" \ | |
196 | --trailer "Helped-by: C3 E3" \ | |
197 | --amend && | |
198 | git cat-file commit HEAD >commit.msg && | |
199 | sed -e "1,/^\$/d" commit.msg >actual && | |
200 | test_cmp expected actual | |
201 | ' | |
202 | ||
203 | test_expect_success 'commit --trailer with -c and "add" as ifexists' ' | |
204 | trailer_commit_base && | |
205 | cat >expected <<-\EOF && | |
206 | hello | |
207 | ||
208 | Signed-off-by: C O Mitter <committer@example.com> | |
209 | Signed-off-by: C1 E1 | |
210 | Helped-by: C2 E2 | |
211 | Reported-by: C3 E3 | |
212 | Mentored-by: C4 E4 | |
213 | Reported-by: C3 E3 | |
214 | Mentored-by: C4 E4 | |
215 | EOF | |
216 | git -c trailer.ifexists="add" \ | |
217 | commit --trailer "Reported-by: C3 E3" \ | |
218 | --trailer "Mentored-by: C4 E4" \ | |
219 | --amend && | |
220 | git cat-file commit HEAD >commit.msg && | |
221 | sed -e "1,/^\$/d" commit.msg >actual && | |
222 | test_cmp expected actual | |
223 | ' | |
224 | ||
225 | test_expect_success 'commit --trailer with -c and "donothing" as ifexists' ' | |
226 | trailer_commit_base && | |
227 | cat >expected <<-\EOF && | |
228 | hello | |
229 | ||
230 | Signed-off-by: C O Mitter <committer@example.com> | |
231 | Signed-off-by: C1 E1 | |
232 | Helped-by: C2 E2 | |
233 | Reported-by: C3 E3 | |
234 | Mentored-by: C4 E4 | |
235 | Reviewed-by: C6 E6 | |
236 | EOF | |
237 | git -c trailer.ifexists="donothing" \ | |
238 | commit --trailer "Mentored-by: C5 E5" \ | |
239 | --trailer "Reviewed-by: C6 E6" \ | |
240 | --amend && | |
241 | git cat-file commit HEAD >commit.msg && | |
242 | sed -e "1,/^\$/d" commit.msg >actual && | |
243 | test_cmp expected actual | |
244 | ' | |
245 | ||
246 | test_expect_success 'commit --trailer with -c and "addIfDifferent" as ifexists' ' | |
247 | trailer_commit_base && | |
248 | cat >expected <<-\EOF && | |
249 | hello | |
250 | ||
251 | Signed-off-by: C O Mitter <committer@example.com> | |
252 | Signed-off-by: C1 E1 | |
253 | Helped-by: C2 E2 | |
254 | Reported-by: C3 E3 | |
255 | Mentored-by: C4 E4 | |
256 | Mentored-by: C5 E5 | |
257 | EOF | |
258 | git -c trailer.ifexists="addIfDifferent" \ | |
259 | commit --trailer "Reported-by: C3 E3" \ | |
260 | --trailer "Mentored-by: C5 E5" \ | |
261 | --amend && | |
262 | git cat-file commit HEAD >commit.msg && | |
263 | sed -e "1,/^\$/d" commit.msg >actual && | |
264 | test_cmp expected actual | |
265 | ' | |
266 | ||
267 | test_expect_success 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists' ' | |
268 | trailer_commit_base && | |
269 | cat >expected <<-\EOF && | |
270 | hello | |
271 | ||
272 | Signed-off-by: C O Mitter <committer@example.com> | |
273 | Signed-off-by: C1 E1 | |
274 | Helped-by: C2 E2 | |
275 | Reported-by: C3 E3 | |
276 | Mentored-by: C4 E4 | |
277 | Reported-by: C3 E3 | |
278 | EOF | |
279 | git -c trailer.ifexists="addIfDifferentNeighbor" \ | |
280 | commit --trailer "Mentored-by: C4 E4" \ | |
281 | --trailer "Reported-by: C3 E3" \ | |
282 | --amend && | |
283 | git cat-file commit HEAD >commit.msg && | |
284 | sed -e "1,/^\$/d" commit.msg >actual && | |
285 | test_cmp expected actual | |
286 | ' | |
287 | ||
288 | test_expect_success 'commit --trailer with -c and "end" as where' ' | |
289 | trailer_commit_base && | |
290 | cat >expected <<-\EOF && | |
291 | hello | |
292 | ||
293 | Signed-off-by: C O Mitter <committer@example.com> | |
294 | Signed-off-by: C1 E1 | |
295 | Helped-by: C2 E2 | |
296 | Reported-by: C3 E3 | |
297 | Mentored-by: C4 E4 | |
298 | Reported-by: C3 E3 | |
299 | Mentored-by: C4 E4 | |
300 | EOF | |
301 | git -c trailer.where="end" \ | |
302 | commit --trailer "Reported-by: C3 E3" \ | |
303 | --trailer "Mentored-by: C4 E4" \ | |
304 | --amend && | |
305 | git cat-file commit HEAD >commit.msg && | |
306 | sed -e "1,/^\$/d" commit.msg >actual && | |
307 | test_cmp expected actual | |
308 | ' | |
309 | ||
310 | test_expect_success 'commit --trailer with -c and "start" as where' ' | |
311 | trailer_commit_base && | |
312 | cat >expected <<-\EOF && | |
313 | hello | |
314 | ||
315 | Signed-off-by: C1 E1 | |
316 | Signed-off-by: C O Mitter <committer@example.com> | |
317 | Signed-off-by: C1 E1 | |
318 | Helped-by: C2 E2 | |
319 | Reported-by: C3 E3 | |
320 | Mentored-by: C4 E4 | |
321 | EOF | |
322 | git -c trailer.where="start" \ | |
323 | commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \ | |
324 | --trailer "Signed-off-by: C1 E1" \ | |
325 | --amend && | |
326 | git cat-file commit HEAD >commit.msg && | |
327 | sed -e "1,/^\$/d" commit.msg >actual && | |
328 | test_cmp expected actual | |
329 | ' | |
330 | ||
331 | test_expect_success 'commit --trailer with -c and "after" as where' ' | |
332 | trailer_commit_base && | |
333 | cat >expected <<-\EOF && | |
334 | hello | |
335 | ||
336 | Signed-off-by: C O Mitter <committer@example.com> | |
337 | Signed-off-by: C1 E1 | |
338 | Helped-by: C2 E2 | |
339 | Reported-by: C3 E3 | |
340 | Mentored-by: C4 E4 | |
341 | Mentored-by: C5 E5 | |
342 | EOF | |
343 | git -c trailer.where="after" \ | |
344 | commit --trailer "Mentored-by: C4 E4" \ | |
345 | --trailer "Mentored-by: C5 E5" \ | |
346 | --amend && | |
347 | git cat-file commit HEAD >commit.msg && | |
348 | sed -e "1,/^\$/d" commit.msg >actual && | |
349 | test_cmp expected actual | |
350 | ' | |
351 | ||
352 | test_expect_success 'commit --trailer with -c and "before" as where' ' | |
353 | trailer_commit_base && | |
354 | cat >expected <<-\EOF && | |
355 | hello | |
356 | ||
357 | Signed-off-by: C O Mitter <committer@example.com> | |
358 | Signed-off-by: C1 E1 | |
359 | Helped-by: C2 E2 | |
360 | Reported-by: C3 E3 | |
361 | Mentored-by: C2 E2 | |
362 | Mentored-by: C3 E3 | |
363 | Mentored-by: C4 E4 | |
364 | EOF | |
365 | git -c trailer.where="before" \ | |
366 | commit --trailer "Mentored-by: C3 E3" \ | |
367 | --trailer "Mentored-by: C2 E2" \ | |
368 | --amend && | |
369 | git cat-file commit HEAD >commit.msg && | |
370 | sed -e "1,/^\$/d" commit.msg >actual && | |
371 | test_cmp expected actual | |
372 | ' | |
373 | ||
374 | test_expect_success 'commit --trailer with -c and "donothing" as ifmissing' ' | |
375 | trailer_commit_base && | |
376 | cat >expected <<-\EOF && | |
377 | hello | |
378 | ||
379 | Signed-off-by: C O Mitter <committer@example.com> | |
380 | Signed-off-by: C1 E1 | |
381 | Helped-by: C2 E2 | |
382 | Reported-by: C3 E3 | |
383 | Mentored-by: C4 E4 | |
384 | Helped-by: C5 E5 | |
385 | EOF | |
386 | git -c trailer.ifmissing="donothing" \ | |
387 | commit --trailer "Helped-by: C5 E5" \ | |
388 | --trailer "Based-by: C6 E6" \ | |
389 | --amend && | |
390 | git cat-file commit HEAD >commit.msg && | |
391 | sed -e "1,/^\$/d" commit.msg >actual && | |
392 | test_cmp expected actual | |
393 | ' | |
394 | ||
395 | test_expect_success 'commit --trailer with -c and "add" as ifmissing' ' | |
396 | trailer_commit_base && | |
397 | cat >expected <<-\EOF && | |
398 | hello | |
399 | ||
400 | Signed-off-by: C O Mitter <committer@example.com> | |
401 | Signed-off-by: C1 E1 | |
402 | Helped-by: C2 E2 | |
403 | Reported-by: C3 E3 | |
404 | Mentored-by: C4 E4 | |
405 | Helped-by: C5 E5 | |
406 | Based-by: C6 E6 | |
407 | EOF | |
408 | git -c trailer.ifmissing="add" \ | |
409 | commit --trailer "Helped-by: C5 E5" \ | |
410 | --trailer "Based-by: C6 E6" \ | |
411 | --amend && | |
412 | git cat-file commit HEAD >commit.msg && | |
413 | sed -e "1,/^\$/d" commit.msg >actual && | |
414 | test_cmp expected actual | |
415 | ' | |
416 | ||
417 | test_expect_success 'commit --trailer with -c ack.key ' ' | |
418 | echo "fun" >>file1 && | |
419 | git add file1 && | |
420 | cat >expected <<-\EOF && | |
421 | hello | |
422 | ||
423 | Acked-by: Peff | |
424 | EOF | |
425 | git -c trailer.ack.key="Acked-by" \ | |
426 | commit --trailer "ack = Peff" -m "hello" && | |
427 | git cat-file commit HEAD >commit.msg && | |
428 | sed -e "1,/^\$/d" commit.msg >actual && | |
429 | test_cmp expected actual | |
430 | ' | |
431 | ||
432 | test_expect_success 'commit --trailer with -c and ":=#" as separators' ' | |
433 | echo "fun" >>file1 && | |
434 | git add file1 && | |
435 | cat >expected <<-\EOF && | |
436 | I hate bug | |
437 | ||
438 | Bug #42 | |
439 | EOF | |
440 | git -c trailer.separators=":=#" \ | |
441 | -c trailer.bug.key="Bug #" \ | |
442 | commit --trailer "bug = 42" -m "I hate bug" && | |
443 | git cat-file commit HEAD >commit.msg && | |
444 | sed -e "1,/^\$/d" commit.msg >actual && | |
445 | test_cmp expected actual | |
446 | ' | |
447 | ||
448 | test_expect_success 'commit --trailer with -c and command' ' | |
449 | trailer_commit_base && | |
450 | cat >expected <<-\EOF && | |
451 | hello | |
452 | ||
453 | Signed-off-by: C O Mitter <committer@example.com> | |
454 | Signed-off-by: C1 E1 | |
455 | Helped-by: C2 E2 | |
456 | Mentored-by: C4 E4 | |
457 | Reported-by: A U Thor <author@example.com> | |
458 | EOF | |
459 | git -c trailer.report.key="Reported-by: " \ | |
460 | -c trailer.report.ifexists="replace" \ | |
461 | -c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \ | |
462 | git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \ | |
463 | commit --trailer "report = author" --amend && | |
464 | git cat-file commit HEAD >commit.msg && | |
465 | sed -e "1,/^\$/d" commit.msg >actual && | |
466 | test_cmp expected actual | |
467 | ' | |
468 | ||
b468f0ce JH |
469 | test_expect_success 'multiple -m' ' |
470 | ||
471 | >negative && | |
472 | git add negative && | |
473 | git commit -m "one" -m "two" -m "three" && | |
94ca361b DL |
474 | actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) && |
475 | expected=$(test_write_lines "one" "" "two" "" "three") && | |
b468f0ce JH |
476 | test "z$actual" = "z$expected" |
477 | ||
478 | ' | |
479 | ||
480 | test_expect_success 'verbose' ' | |
481 | ||
482 | echo minus >negative && | |
483 | git add negative && | |
94ca361b DL |
484 | git status -v >raw && |
485 | sed -ne "/^diff --git /p" raw >actual && | |
b468f0ce | 486 | echo "diff --git a/negative b/negative" >expect && |
82ebb0b6 | 487 | test_cmp expect actual |
b468f0ce JH |
488 | |
489 | ' | |
490 | ||
4f672ad6 JK |
491 | test_expect_success 'verbose respects diff config' ' |
492 | ||
0fcf760e | 493 | test_config diff.noprefix true && |
4f672ad6 | 494 | git status -v >actual && |
0fcf760e | 495 | grep "diff --git negative negative" actual |
4f672ad6 JK |
496 | ' |
497 | ||
5b012c80 BC |
498 | mesg_with_comment_and_newlines=' |
499 | # text | |
500 | ||
501 | ' | |
502 | ||
503 | test_expect_success 'prepare file with comment line and trailing newlines' ' | |
504 | printf "%s" "$mesg_with_comment_and_newlines" >expect | |
505 | ' | |
506 | ||
51fb3a3d | 507 | test_expect_success 'cleanup commit messages (verbatim option,-t)' ' |
5f065737 AR |
508 | |
509 | echo >>negative && | |
67dabab0 | 510 | git commit --cleanup=verbatim --no-status -t expect -a && |
94ca361b DL |
511 | git cat-file -p HEAD >raw && |
512 | sed -e "1,/^\$/d" raw >actual && | |
82ebb0b6 | 513 | test_cmp expect actual |
5f065737 AR |
514 | |
515 | ' | |
516 | ||
51fb3a3d | 517 | test_expect_success 'cleanup commit messages (verbatim option,-F)' ' |
5f065737 AR |
518 | |
519 | echo >>negative && | |
520 | git commit --cleanup=verbatim -F expect -a && | |
94ca361b DL |
521 | git cat-file -p HEAD >raw && |
522 | sed -e "1,/^\$/d" raw >actual && | |
82ebb0b6 | 523 | test_cmp expect actual |
5f065737 AR |
524 | |
525 | ' | |
526 | ||
a24a41ea | 527 | test_expect_success 'cleanup commit messages (verbatim option,-m)' ' |
5f065737 AR |
528 | |
529 | echo >>negative && | |
5b012c80 | 530 | git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a && |
94ca361b DL |
531 | git cat-file -p HEAD >raw && |
532 | sed -e "1,/^\$/d" raw >actual && | |
82ebb0b6 | 533 | test_cmp expect actual |
5f065737 AR |
534 | |
535 | ' | |
536 | ||
51fb3a3d | 537 | test_expect_success 'cleanup commit messages (whitespace option,-F)' ' |
5f065737 AR |
538 | |
539 | echo >>negative && | |
94ca361b | 540 | test_write_lines "" "# text" "" >text && |
5f065737 AR |
541 | echo "# text" >expect && |
542 | git commit --cleanup=whitespace -F text -a && | |
94ca361b DL |
543 | git cat-file -p HEAD >raw && |
544 | sed -e "1,/^\$/d" raw >actual && | |
82ebb0b6 | 545 | test_cmp expect actual |
5f065737 AR |
546 | |
547 | ' | |
548 | ||
75df1f43 NTND |
549 | test_expect_success 'cleanup commit messages (scissors option,-F,-e)' ' |
550 | ||
551 | echo >>negative && | |
94ca361b | 552 | cat >text <<-\EOF && |
75df1f43 | 553 | |
94ca361b | 554 | # to be kept |
fbfa0973 | 555 | |
94ca361b DL |
556 | # ------------------------ >8 ------------------------ |
557 | # to be kept, too | |
558 | # ------------------------ >8 ------------------------ | |
559 | to be removed | |
560 | # ------------------------ >8 ------------------------ | |
561 | to be removed, too | |
562 | EOF | |
fbfa0973 | 563 | |
94ca361b DL |
564 | cat >expect <<-\EOF && |
565 | # to be kept | |
fbfa0973 | 566 | |
94ca361b DL |
567 | # ------------------------ >8 ------------------------ |
568 | # to be kept, too | |
569 | EOF | |
75df1f43 | 570 | git commit --cleanup=scissors -e -F text -a && |
94ca361b DL |
571 | git cat-file -p HEAD >raw && |
572 | sed -e "1,/^\$/d" raw >actual && | |
75df1f43 | 573 | test_cmp expect actual |
fbfa0973 | 574 | ' |
75df1f43 | 575 | |
fbfa0973 SG |
576 | test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line)' ' |
577 | ||
578 | echo >>negative && | |
94ca361b DL |
579 | cat >text <<-\EOF && |
580 | # ------------------------ >8 ------------------------ | |
581 | to be removed | |
582 | EOF | |
fbfa0973 | 583 | git commit --cleanup=scissors -e -F text -a --allow-empty-message && |
94ca361b DL |
584 | git cat-file -p HEAD >raw && |
585 | sed -e "1,/^\$/d" raw >actual && | |
fbfa0973 | 586 | test_must_be_empty actual |
75df1f43 NTND |
587 | ' |
588 | ||
51fb3a3d | 589 | test_expect_success 'cleanup commit messages (strip option,-F)' ' |
5f065737 AR |
590 | |
591 | echo >>negative && | |
94ca361b | 592 | test_write_lines "" "# text" "sample" "" >text && |
5f065737 AR |
593 | echo sample >expect && |
594 | git commit --cleanup=strip -F text -a && | |
94ca361b DL |
595 | git cat-file -p HEAD >raw && |
596 | sed -e "1,/^\$/d" raw >actual && | |
82ebb0b6 | 597 | test_cmp expect actual |
5f065737 AR |
598 | |
599 | ' | |
600 | ||
51fb3a3d | 601 | test_expect_success 'cleanup commit messages (strip option,-F,-e)' ' |
5f065737 AR |
602 | |
603 | echo >>negative && | |
94ca361b | 604 | test_write_lines "" "sample" "" >text && |
5f065737 | 605 | git commit -e -F text -a && |
0b430a17 ÆAB |
606 | head -n 4 .git/COMMIT_EDITMSG >actual |
607 | ' | |
608 | ||
609 | echo "sample | |
5f065737 | 610 | |
0b430a17 ÆAB |
611 | # Please enter the commit message for your changes. Lines starting |
612 | # with '#' will be ignored, and an empty message aborts the commit." >expect | |
613 | ||
51fb3a3d | 614 | test_expect_success 'cleanup commit messages (strip option,-F,-e): output' ' |
1108cea7 | 615 | test_cmp expect actual |
5f065737 AR |
616 | ' |
617 | ||
51fb3a3d RT |
618 | test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' ' |
619 | test_must_fail git commit --cleanup=non-existent | |
620 | ' | |
621 | ||
622 | test_expect_success 'cleanup commit message (fail on invalid cleanup mode configuration)' ' | |
623 | test_must_fail git -c commit.cleanup=non-existent commit | |
624 | ' | |
625 | ||
626 | test_expect_success 'cleanup commit message (no config and no option uses default)' ' | |
627 | echo content >>file && | |
628 | git add file && | |
24e099f4 BC |
629 | ( |
630 | test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && | |
631 | git commit --no-status | |
632 | ) && | |
51fb3a3d RT |
633 | commit_msg_is "commit message" |
634 | ' | |
635 | ||
636 | test_expect_success 'cleanup commit message (option overrides default)' ' | |
637 | echo content >>file && | |
638 | git add file && | |
24e099f4 BC |
639 | ( |
640 | test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && | |
641 | git commit --cleanup=whitespace --no-status | |
642 | ) && | |
51fb3a3d RT |
643 | commit_msg_is "commit message # comment" |
644 | ' | |
645 | ||
646 | test_expect_success 'cleanup commit message (config overrides default)' ' | |
647 | echo content >>file && | |
648 | git add file && | |
24e099f4 BC |
649 | ( |
650 | test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && | |
651 | git -c commit.cleanup=whitespace commit --no-status | |
652 | ) && | |
51fb3a3d RT |
653 | commit_msg_is "commit message # comment" |
654 | ' | |
655 | ||
656 | test_expect_success 'cleanup commit message (option overrides config)' ' | |
657 | echo content >>file && | |
658 | git add file && | |
24e099f4 BC |
659 | ( |
660 | test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && | |
661 | git -c commit.cleanup=whitespace commit --cleanup=default | |
662 | ) && | |
51fb3a3d RT |
663 | commit_msg_is "commit message" |
664 | ' | |
665 | ||
666 | test_expect_success 'cleanup commit message (default, -m)' ' | |
667 | echo content >>file && | |
668 | git add file && | |
669 | git commit -m "message #comment " && | |
670 | commit_msg_is "message #comment" | |
671 | ' | |
672 | ||
673 | test_expect_success 'cleanup commit message (whitespace option, -m)' ' | |
674 | echo content >>file && | |
675 | git add file && | |
676 | git commit --cleanup=whitespace --no-status -m "message #comment " && | |
677 | commit_msg_is "message #comment" | |
678 | ' | |
679 | ||
680 | test_expect_success 'cleanup commit message (whitespace config, -m)' ' | |
681 | echo content >>file && | |
682 | git add file && | |
683 | git -c commit.cleanup=whitespace commit --no-status -m "message #comment " && | |
684 | commit_msg_is "message #comment" | |
685 | ' | |
686 | ||
1f4bf345 | 687 | test_expect_success 'message shows author when it is not equal to committer' ' |
e83dbe80 | 688 | echo >>negative && |
ceacd91a | 689 | git commit -e -m "sample" -a && |
1f4bf345 JK |
690 | test_i18ngrep \ |
691 | "^# Author: *A U Thor <author@example.com>\$" \ | |
692 | .git/COMMIT_EDITMSG | |
e83dbe80 SB |
693 | ' |
694 | ||
b7242b8c JK |
695 | test_expect_success 'message shows date when it is explicitly set' ' |
696 | git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" && | |
697 | test_i18ngrep \ | |
698 | "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \ | |
699 | .git/COMMIT_EDITMSG | |
700 | ' | |
701 | ||
1d7dc264 | 702 | test_expect_success AUTOIDENT 'message shows committer when it is automatic' ' |
bb1ae3f6 SB |
703 | |
704 | echo >>negative && | |
7845944c | 705 | ( |
00648ba0 EN |
706 | sane_unset GIT_COMMITTER_EMAIL && |
707 | sane_unset GIT_COMMITTER_NAME && | |
1d7dc264 | 708 | git commit -e -m "sample" -a |
7845944c | 709 | ) && |
1f4bf345 JK |
710 | # the ident is calculated from the system, so we cannot |
711 | # check the actual value, only that it is there | |
712 | test_i18ngrep "^# Committer: " .git/COMMIT_EDITMSG | |
bb1ae3f6 SB |
713 | ' |
714 | ||
a9ebc43b | 715 | write_script .git/FAKE_EDITOR <<EOF |
94ca361b | 716 | echo editor started >"$(pwd)/.git/result" |
ec84bd00 PB |
717 | exit 0 |
718 | EOF | |
ec84bd00 | 719 | |
cf7a8515 | 720 | test_expect_success !FAIL_PREREQS,!AUTOIDENT 'do not fire editor when committer is bogus' ' |
f84df81f | 721 | >.git/result && |
8c8b3bc3 JK |
722 | |
723 | echo >>negative && | |
724 | ( | |
725 | sane_unset GIT_COMMITTER_EMAIL && | |
726 | sane_unset GIT_COMMITTER_NAME && | |
727 | GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" && | |
728 | export GIT_EDITOR && | |
729 | test_must_fail git commit -e -m sample -a | |
730 | ) && | |
d3c6751b | 731 | test_must_be_empty .git/result |
8c8b3bc3 JK |
732 | ' |
733 | ||
25206778 RS |
734 | test_expect_success 'do not fire editor if -m <msg> was given' ' |
735 | echo tick >file && | |
736 | git add file && | |
737 | echo "editor not started" >.git/result && | |
738 | (GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) && | |
739 | test "$(cat .git/result)" = "editor not started" | |
740 | ' | |
741 | ||
742 | test_expect_success 'do not fire editor if -m "" was given' ' | |
743 | echo tock >file && | |
744 | git add file && | |
745 | echo "editor not started" >.git/result && | |
746 | (GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \ | |
747 | git commit -m "" --allow-empty-message) && | |
748 | test "$(cat .git/result)" = "editor not started" | |
749 | ' | |
750 | ||
ec84bd00 PB |
751 | test_expect_success 'do not fire editor in the presence of conflicts' ' |
752 | ||
a3c91e08 JH |
753 | git clean -f && |
754 | echo f >g && | |
755 | git add g && | |
756 | git commit -m "add g" && | |
757 | git branch second && | |
1e2ae142 | 758 | echo main >g && |
a3c91e08 JH |
759 | echo g >h && |
760 | git add g h && | |
761 | git commit -m "modify g and add h" && | |
762 | git checkout second && | |
763 | echo second >g && | |
764 | git add g && | |
765 | git commit -m second && | |
766 | # Must fail due to conflict | |
1e2ae142 | 767 | test_must_fail git cherry-pick -n main && |
a3c91e08 | 768 | echo "editor not started" >.git/result && |
e2007832 | 769 | ( |
34565f27 | 770 | GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" && |
e2007832 BC |
771 | export GIT_EDITOR && |
772 | test_must_fail git commit | |
773 | ) && | |
a3c91e08 | 774 | test "$(cat .git/result)" = "editor not started" |
ec84bd00 PB |
775 | ' |
776 | ||
a9ebc43b | 777 | write_script .git/FAKE_EDITOR <<EOF |
ad5fa3cc PB |
778 | # kill -TERM command added below. |
779 | EOF | |
780 | ||
fb9a2bea | 781 | test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' ' |
ad5fa3cc | 782 | echo >>negative && |
09b78bc1 | 783 | ! "$SHELL_PATH" -c '\'' |
94ca361b | 784 | echo kill -TERM $$ >>.git/FAKE_EDITOR |
09b78bc1 BC |
785 | GIT_EDITOR=.git/FAKE_EDITOR |
786 | export GIT_EDITOR | |
787 | exec git commit -a'\'' && | |
788 | test ! -f .git/index.lock | |
ad5fa3cc PB |
789 | ' |
790 | ||
67bfc030 JH |
791 | rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG |
792 | git reset -q --hard | |
793 | ||
794 | test_expect_success 'Hand committing of a redundant merge removes dups' ' | |
795 | ||
1e2ae142 JS |
796 | git rev-parse second main >expect && |
797 | test_must_fail git merge second main && | |
798 | git checkout main g && | |
67bfc030 | 799 | EDITOR=: git commit -a && |
94ca361b DL |
800 | git cat-file commit HEAD >raw && |
801 | sed -n -e "s/^parent //p" -e "/^$/q" raw >actual && | |
67bfc030 JH |
802 | test_cmp expect actual |
803 | ||
804 | ' | |
805 | ||
e5138436 JH |
806 | test_expect_success 'A single-liner subject with a token plus colon is not a footer' ' |
807 | ||
808 | git reset --hard && | |
809 | git commit -s -m "hello: kitty" --allow-empty && | |
94ca361b DL |
810 | git cat-file commit HEAD >raw && |
811 | sed -e "1,/^$/d" raw >actual && | |
3fb0459b | 812 | test_line_count = 3 actual |
e5138436 JH |
813 | |
814 | ' | |
815 | ||
8c613fd5 BC |
816 | test_expect_success 'commit -s places sob on third line after two empty lines' ' |
817 | git commit -s --allow-empty --allow-empty-message && | |
818 | cat <<-EOF >expect && | |
819 | ||
820 | ||
821 | Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> | |
822 | ||
823 | EOF | |
824 | sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual && | |
825 | test_cmp expect actual | |
826 | ' | |
827 | ||
a9ebc43b JK |
828 | write_script .git/FAKE_EDITOR <<\EOF |
829 | mv "$1" "$1.orig" | |
f9c01817 JH |
830 | ( |
831 | echo message | |
a9ebc43b JK |
832 | cat "$1.orig" |
833 | ) >"$1" | |
f9c01817 JH |
834 | EOF |
835 | ||
836 | echo '## Custom template' >template | |
837 | ||
f9c01817 JH |
838 | try_commit () { |
839 | git reset --hard && | |
840 | echo >>negative && | |
841 | GIT_EDITOR=.git/FAKE_EDITOR git commit -a $* $use_template && | |
842 | case "$use_template" in | |
843 | '') | |
f79ce8db | 844 | test_i18ngrep ! "^## Custom template" .git/COMMIT_EDITMSG ;; |
f9c01817 | 845 | *) |
f79ce8db | 846 | test_i18ngrep "^## Custom template" .git/COMMIT_EDITMSG ;; |
f9c01817 JH |
847 | esac |
848 | } | |
849 | ||
850 | try_commit_status_combo () { | |
851 | ||
f79ce8db | 852 | test_expect_success 'commit' ' |
f9c01817 | 853 | try_commit "" && |
f79ce8db | 854 | test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
855 | ' |
856 | ||
f79ce8db | 857 | test_expect_success 'commit --status' ' |
f9c01817 | 858 | try_commit --status && |
f79ce8db | 859 | test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
860 | ' |
861 | ||
f79ce8db | 862 | test_expect_success 'commit --no-status' ' |
2dec68cf | 863 | try_commit --no-status && |
f79ce8db | 864 | test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
865 | ' |
866 | ||
f79ce8db | 867 | test_expect_success 'commit with commit.status = yes' ' |
e023a31d | 868 | test_config commit.status yes && |
f9c01817 | 869 | try_commit "" && |
f79ce8db | 870 | test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
871 | ' |
872 | ||
f79ce8db | 873 | test_expect_success 'commit with commit.status = no' ' |
e023a31d | 874 | test_config commit.status no && |
f9c01817 | 875 | try_commit "" && |
f79ce8db | 876 | test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
877 | ' |
878 | ||
f79ce8db | 879 | test_expect_success 'commit --status with commit.status = yes' ' |
e023a31d | 880 | test_config commit.status yes && |
f9c01817 | 881 | try_commit --status && |
f79ce8db | 882 | test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
883 | ' |
884 | ||
f79ce8db | 885 | test_expect_success 'commit --no-status with commit.status = yes' ' |
e023a31d | 886 | test_config commit.status yes && |
f9c01817 | 887 | try_commit --no-status && |
f79ce8db | 888 | test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
889 | ' |
890 | ||
f79ce8db | 891 | test_expect_success 'commit --status with commit.status = no' ' |
e023a31d | 892 | test_config commit.status no && |
f9c01817 | 893 | try_commit --status && |
f79ce8db | 894 | test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
895 | ' |
896 | ||
f79ce8db | 897 | test_expect_success 'commit --no-status with commit.status = no' ' |
e023a31d | 898 | test_config commit.status no && |
f9c01817 | 899 | try_commit --no-status && |
f79ce8db | 900 | test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG |
f9c01817 JH |
901 | ' |
902 | ||
903 | } | |
904 | ||
905 | try_commit_status_combo | |
906 | ||
907 | use_template="-t template" | |
908 | ||
909 | try_commit_status_combo | |
910 | ||
eff80a9f | 911 | test_expect_success 'commit --status with custom comment character' ' |
464be630 | 912 | test_config core.commentchar ";" && |
eff80a9f JH |
913 | try_commit --status && |
914 | test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG | |
915 | ' | |
916 | ||
84c9dc2c NTND |
917 | test_expect_success 'switch core.commentchar' ' |
918 | test_commit "#foo" foo && | |
919 | GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend && | |
920 | test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG | |
921 | ' | |
922 | ||
923 | test_expect_success 'switch core.commentchar but out of options' ' | |
924 | cat >text <<\EOF && | |
925 | # 1 | |
926 | ; 2 | |
927 | @ 3 | |
928 | ! 4 | |
929 | $ 5 | |
930 | % 6 | |
931 | ^ 7 | |
932 | & 8 | |
933 | | 9 | |
934 | : 10 | |
935 | EOF | |
936 | git commit --amend -F text && | |
937 | ( | |
938 | test_set_editor .git/FAKE_EDITOR && | |
939 | test_must_fail git -c core.commentChar=auto commit --amend | |
940 | ) | |
941 | ' | |
942 | ||
b468f0ce | 943 | test_done |