Merge branch 'jk/push-client-deadlock-fix'
[git/git.git] / t / t7501-commit.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
4 #
5
6 # FIXME: Test the various index usages, -i and -o, test reflog,
7 # signoff
8
9 test_description='git commit'
10 . ./test-lib.sh
11 . "$TEST_DIRECTORY/diff-lib.sh"
12
13 author='The Real Author <someguy@his.email.org>'
14
15 test_tick
16
17 test_expect_success 'initial status' '
18 echo bongo bongo >file &&
19 git add file &&
20 git status >actual &&
21 test_i18ngrep "Initial commit" actual
22 '
23
24 test_expect_success 'fail initial amend' '
25 test_must_fail git commit --amend
26 '
27
28 test_expect_success 'setup: initial commit' '
29 git commit -m initial
30 '
31
32 test_expect_success '-m and -F do not mix' '
33 git checkout HEAD file && echo >>file && git add file &&
34 test_must_fail git commit -m foo -m bar -F file
35 '
36
37 test_expect_success '-m and -C do not mix' '
38 git checkout HEAD file && echo >>file && git add file &&
39 test_must_fail git commit -C HEAD -m illegal
40 '
41
42 test_expect_success 'paths and -a do not mix' '
43 echo King of the bongo >file &&
44 test_must_fail git commit -m foo -a file
45 '
46
47 test_expect_success PERL 'can use paths with --interactive' '
48 echo bong-o-bong >file &&
49 # 2: update, 1:st path, that is all, 7: quit
50 ( echo 2; echo 1; echo; echo 7 ) |
51 git commit -m foo --interactive file &&
52 git reset --hard HEAD^
53 '
54
55 test_expect_success 'using invalid commit with -C' '
56 test_must_fail git commit --allow-empty -C bogus
57 '
58
59 test_expect_success 'nothing to commit' '
60 git reset --hard &&
61 test_must_fail git commit -m initial
62 '
63
64 test_expect_success '--dry-run fails with nothing to commit' '
65 test_must_fail git commit -m initial --dry-run
66 '
67
68 test_expect_success '--short fails with nothing to commit' '
69 test_must_fail git commit -m initial --short
70 '
71
72 test_expect_success '--porcelain fails with nothing to commit' '
73 test_must_fail git commit -m initial --porcelain
74 '
75
76 test_expect_success '--long fails with nothing to commit' '
77 test_must_fail git commit -m initial --long
78 '
79
80 test_expect_success 'setup: non-initial commit' '
81 echo bongo bongo bongo >file &&
82 git commit -m next -a
83 '
84
85 test_expect_success '--dry-run with stuff to commit returns ok' '
86 echo bongo bongo bongo >>file &&
87 git commit -m next -a --dry-run
88 '
89
90 test_expect_failure '--short with stuff to commit returns ok' '
91 echo bongo bongo bongo >>file &&
92 git commit -m next -a --short
93 '
94
95 test_expect_failure '--porcelain with stuff to commit returns ok' '
96 echo bongo bongo bongo >>file &&
97 git commit -m next -a --porcelain
98 '
99
100 test_expect_success '--long with stuff to commit returns ok' '
101 echo bongo bongo bongo >>file &&
102 git commit -m next -a --long
103 '
104
105 test_expect_success 'commit message from non-existing file' '
106 echo more bongo: bongo bongo bongo bongo >file &&
107 test_must_fail git commit -F gah -a
108 '
109
110 test_expect_success 'empty commit message' '
111 # Empty except stray tabs and spaces on a few lines.
112 sed -e "s/@//g" >msg <<-\EOF &&
113 @ @
114 @@
115 @ @
116 @Signed-off-by: hula@
117 EOF
118 test_must_fail git commit -F msg -a
119 '
120
121 test_expect_success 'template "emptyness" check does not kick in with -F' '
122 git checkout HEAD file && echo >>file && git add file &&
123 git commit -t file -F file
124 '
125
126 test_expect_success 'template "emptyness" check' '
127 git checkout HEAD file && echo >>file && git add file &&
128 test_must_fail git commit -t file 2>err &&
129 test_i18ngrep "did not edit" err
130 '
131
132 test_expect_success 'setup: commit message from file' '
133 git checkout HEAD file && echo >>file && git add file &&
134 echo this is the commit message, coming from a file >msg &&
135 git commit -F msg -a
136 '
137
138 test_expect_success 'amend commit' '
139 cat >editor <<-\EOF &&
140 #!/bin/sh
141 sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
142 mv "$1-" "$1"
143 EOF
144 chmod 755 editor &&
145 EDITOR=./editor git commit --amend
146 '
147
148 test_expect_success 'amend --only ignores staged contents' '
149 cp file file.expect &&
150 echo changed >file &&
151 git add file &&
152 git commit --no-edit --amend --only &&
153 git cat-file blob HEAD:file >file.actual &&
154 test_cmp file.expect file.actual &&
155 git diff --exit-code
156 '
157
158 test_expect_success 'set up editor' '
159 cat >editor <<-\EOF &&
160 #!/bin/sh
161 sed -e "s/unamended/amended/g" <"$1" >"$1-"
162 mv "$1-" "$1"
163 EOF
164 chmod 755 editor
165 '
166
167 test_expect_success 'amend without launching editor' '
168 echo unamended >expect &&
169 git commit --allow-empty -m "unamended" &&
170 echo needs more bongo >file &&
171 git add file &&
172 EDITOR=./editor git commit --no-edit --amend &&
173 git diff --exit-code HEAD -- file &&
174 git diff-tree -s --format=%s HEAD >msg &&
175 test_cmp expect msg
176 '
177
178 test_expect_success '--amend --edit' '
179 echo amended >expect &&
180 git commit --allow-empty -m "unamended" &&
181 echo bongo again >file &&
182 git add file &&
183 EDITOR=./editor git commit --edit --amend &&
184 git diff-tree -s --format=%s HEAD >msg &&
185 test_cmp expect msg
186 '
187
188 test_expect_success '--amend --edit of empty message' '
189 cat >replace <<-\EOF &&
190 #!/bin/sh
191 echo "amended" >"$1"
192 EOF
193 chmod 755 replace &&
194 git commit --allow-empty --allow-empty-message -m "" &&
195 echo more bongo >file &&
196 git add file &&
197 EDITOR=./replace git commit --edit --amend &&
198 git diff-tree -s --format=%s HEAD >msg &&
199 ./replace expect &&
200 test_cmp expect msg
201 '
202
203 test_expect_success '--amend to set message to empty' '
204 echo bata >file &&
205 git add file &&
206 git commit -m "unamended" &&
207 git commit --amend --allow-empty-message -m "" &&
208 git diff-tree -s --format=%s HEAD >msg &&
209 echo "" >expect &&
210 test_cmp expect msg
211 '
212
213 test_expect_success '--amend to set empty message needs --allow-empty-message' '
214 echo conga >file &&
215 git add file &&
216 git commit -m "unamended" &&
217 test_must_fail git commit --amend -m "" &&
218 git diff-tree -s --format=%s HEAD >msg &&
219 echo "unamended" >expect &&
220 test_cmp expect msg
221 '
222
223 test_expect_success '-m --edit' '
224 echo amended >expect &&
225 git commit --allow-empty -m buffer &&
226 echo bongo bongo >file &&
227 git add file &&
228 EDITOR=./editor git commit -m unamended --edit &&
229 git diff-tree -s --format=%s HEAD >msg &&
230 test_cmp expect msg
231 '
232
233 test_expect_success '-m and -F do not mix' '
234 echo enough with the bongos >file &&
235 test_must_fail git commit -F msg -m amending .
236 '
237
238 test_expect_success 'using message from other commit' '
239 git commit -C HEAD^ .
240 '
241
242 test_expect_success 'editing message from other commit' '
243 cat >editor <<-\EOF &&
244 #!/bin/sh
245 sed -e "s/amend/older/g" < "$1" > "$1-"
246 mv "$1-" "$1"
247 EOF
248 chmod 755 editor &&
249 echo hula hula >file &&
250 EDITOR=./editor git commit -c HEAD^ -a
251 '
252
253 test_expect_success 'message from stdin' '
254 echo silly new contents >file &&
255 echo commit message from stdin |
256 git commit -F - -a
257 '
258
259 test_expect_success 'overriding author from command line' '
260 echo gak >file &&
261 git commit -m author \
262 --author "Rubber Duck <rduck@convoy.org>" -a >output 2>&1 &&
263 grep Rubber.Duck output
264 '
265
266 test_expect_success PERL 'interactive add' '
267 echo 7 |
268 git commit --interactive |
269 grep "What now"
270 '
271
272 test_expect_success PERL "commit --interactive doesn't change index if editor aborts" '
273 echo zoo >file &&
274 test_must_fail git diff --exit-code >diff1 &&
275 (echo u ; echo "*" ; echo q) |
276 (
277 EDITOR=: &&
278 export EDITOR &&
279 test_must_fail git commit --interactive
280 ) &&
281 git diff >diff2 &&
282 compare_diff_patch diff1 diff2
283 '
284
285 test_expect_success 'editor not invoked if -F is given' '
286 cat >editor <<-\EOF &&
287 #!/bin/sh
288 sed -e s/good/bad/g <"$1" >"$1-"
289 mv "$1-" "$1"
290 EOF
291 chmod 755 editor &&
292
293 echo A good commit message. >msg &&
294 echo moo >file &&
295
296 EDITOR=./editor git commit -a -F msg &&
297 git show -s --pretty=format:%s >subject &&
298 grep -q good subject &&
299
300 echo quack >file &&
301 echo Another good message. |
302 EDITOR=./editor git commit -a -F - &&
303 git show -s --pretty=format:%s >subject &&
304 grep -q good subject
305 '
306
307 test_expect_success 'partial commit that involves removal (1)' '
308
309 git rm --cached file &&
310 mv file elif &&
311 git add elif &&
312 git commit -m "Partial: add elif" elif &&
313 git diff-tree --name-status HEAD^ HEAD >current &&
314 echo "A elif" >expected &&
315 test_cmp expected current
316
317 '
318
319 test_expect_success 'partial commit that involves removal (2)' '
320
321 git commit -m "Partial: remove file" file &&
322 git diff-tree --name-status HEAD^ HEAD >current &&
323 echo "D file" >expected &&
324 test_cmp expected current
325
326 '
327
328 test_expect_success 'partial commit that involves removal (3)' '
329
330 git rm --cached elif &&
331 echo elif >elif &&
332 git commit -m "Partial: modify elif" elif &&
333 git diff-tree --name-status HEAD^ HEAD >current &&
334 echo "M elif" >expected &&
335 test_cmp expected current
336
337 '
338
339 test_expect_success 'amend commit to fix author' '
340
341 oldtick=$GIT_AUTHOR_DATE &&
342 test_tick &&
343 git reset --hard &&
344 git cat-file -p HEAD |
345 sed -e "s/author.*/author $author $oldtick/" \
346 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
347 expected &&
348 git commit --amend --author="$author" &&
349 git cat-file -p HEAD > current &&
350 test_cmp expected current
351
352 '
353
354 test_expect_success 'amend commit to fix date' '
355
356 test_tick &&
357 newtick=$GIT_AUTHOR_DATE &&
358 git reset --hard &&
359 git cat-file -p HEAD |
360 sed -e "s/author.*/author $author $newtick/" \
361 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
362 expected &&
363 git commit --amend --date="$newtick" &&
364 git cat-file -p HEAD > current &&
365 test_cmp expected current
366
367 '
368
369 test_expect_success 'commit mentions forced date in output' '
370 git commit --amend --date=2010-01-02T03:04:05 >output &&
371 grep "Date: *Sat Jan 2 03:04:05 2010" output
372 '
373
374 test_expect_success 'commit complains about completely bogus dates' '
375 test_must_fail git commit --amend --date=seventeen
376 '
377
378 test_expect_success 'commit --date allows approxidate' '
379 git commit --amend \
380 --date="midnight the 12th of october, anno domini 1979" &&
381 echo "Fri Oct 12 00:00:00 1979 +0000" >expect &&
382 git log -1 --format=%ad >actual &&
383 test_cmp expect actual
384 '
385
386 test_expect_success 'sign off (1)' '
387
388 echo 1 >positive &&
389 git add positive &&
390 git commit -s -m "thank you" &&
391 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
392 (
393 echo thank you
394 echo
395 git var GIT_COMMITTER_IDENT |
396 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
397 ) >expected &&
398 test_cmp expected actual
399
400 '
401
402 test_expect_success 'sign off (2)' '
403
404 echo 2 >positive &&
405 git add positive &&
406 existing="Signed-off-by: Watch This <watchthis@example.com>" &&
407 git commit -s -m "thank you
408
409 $existing" &&
410 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
411 (
412 echo thank you
413 echo
414 echo $existing
415 git var GIT_COMMITTER_IDENT |
416 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
417 ) >expected &&
418 test_cmp expected actual
419
420 '
421
422 test_expect_success 'signoff gap' '
423
424 echo 3 >positive &&
425 git add positive &&
426 alt="Alt-RFC-822-Header: Value" &&
427 git commit -s -m "welcome
428
429 $alt" &&
430 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
431 (
432 echo welcome
433 echo
434 echo $alt
435 git var GIT_COMMITTER_IDENT |
436 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
437 ) >expected &&
438 test_cmp expected actual
439 '
440
441 test_expect_success 'signoff gap 2' '
442
443 echo 4 >positive &&
444 git add positive &&
445 alt="fixed: 34" &&
446 git commit -s -m "welcome
447
448 We have now
449 $alt" &&
450 git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
451 (
452 echo welcome
453 echo
454 echo We have now
455 echo $alt
456 echo
457 git var GIT_COMMITTER_IDENT |
458 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
459 ) >expected &&
460 test_cmp expected actual
461 '
462
463 test_expect_success 'multiple -m' '
464
465 >negative &&
466 git add negative &&
467 git commit -m "one" -m "two" -m "three" &&
468 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
469 (
470 echo one
471 echo
472 echo two
473 echo
474 echo three
475 ) >expected &&
476 test_cmp expected actual
477
478 '
479
480 test_expect_success 'amend commit to fix author' '
481
482 oldtick=$GIT_AUTHOR_DATE &&
483 test_tick &&
484 git reset --hard &&
485 git cat-file -p HEAD |
486 sed -e "s/author.*/author $author $oldtick/" \
487 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
488 expected &&
489 git commit --amend --author="$author" &&
490 git cat-file -p HEAD > current &&
491 test_cmp expected current
492
493 '
494
495 test_expect_success 'git commit <file> with dirty index' '
496 echo tacocat > elif &&
497 echo tehlulz > chz &&
498 git add chz &&
499 git commit elif -m "tacocat is a palindrome" &&
500 git show --stat | grep elif &&
501 git diff --cached | grep chz
502 '
503
504 test_expect_success 'same tree (single parent)' '
505
506 git reset --hard &&
507 test_must_fail git commit -m empty
508
509 '
510
511 test_expect_success 'same tree (single parent) --allow-empty' '
512
513 git commit --allow-empty -m "forced empty" &&
514 git cat-file commit HEAD | grep forced
515
516 '
517
518 test_expect_success 'same tree (merge and amend merge)' '
519
520 git checkout -b side HEAD^ &&
521 echo zero >zero &&
522 git add zero &&
523 git commit -m "add zero" &&
524 git checkout master &&
525
526 git merge -s ours side -m "empty ok" &&
527 git diff HEAD^ HEAD >actual &&
528 : >expected &&
529 test_cmp expected actual &&
530
531 git commit --amend -m "empty really ok" &&
532 git diff HEAD^ HEAD >actual &&
533 : >expected &&
534 test_cmp expected actual
535
536 '
537
538 test_expect_success 'amend using the message from another commit' '
539
540 git reset --hard &&
541 test_tick &&
542 git commit --allow-empty -m "old commit" &&
543 old=$(git rev-parse --verify HEAD) &&
544 test_tick &&
545 git commit --allow-empty -m "new commit" &&
546 new=$(git rev-parse --verify HEAD) &&
547 test_tick &&
548 git commit --allow-empty --amend -C "$old" &&
549 git show --pretty="format:%ad %s" "$old" >expected &&
550 git show --pretty="format:%ad %s" HEAD >actual &&
551 test_cmp expected actual
552
553 '
554
555 test_expect_success 'amend using the message from a commit named with tag' '
556
557 git reset --hard &&
558 test_tick &&
559 git commit --allow-empty -m "old commit" &&
560 old=$(git rev-parse --verify HEAD) &&
561 git tag -a -m "tag on old" tagged-old HEAD &&
562 test_tick &&
563 git commit --allow-empty -m "new commit" &&
564 new=$(git rev-parse --verify HEAD) &&
565 test_tick &&
566 git commit --allow-empty --amend -C tagged-old &&
567 git show --pretty="format:%ad %s" "$old" >expected &&
568 git show --pretty="format:%ad %s" HEAD >actual &&
569 test_cmp expected actual
570
571 '
572
573 test_expect_success 'amend can copy notes' '
574
575 git config notes.rewrite.amend true &&
576 git config notes.rewriteRef "refs/notes/*" &&
577 test_commit foo &&
578 git notes add -m"a note" &&
579 test_tick &&
580 git commit --amend -m"new foo" &&
581 test "$(git notes show)" = "a note"
582
583 '
584
585 test_expect_success 'commit a file whose name is a dash' '
586 git reset --hard &&
587 for i in 1 2 3 4 5
588 do
589 echo $i
590 done >./- &&
591 git add ./- &&
592 test_tick &&
593 git commit -m "add dash" >output </dev/null &&
594 test_i18ngrep " changed, 5 insertions" output
595 '
596
597 test_expect_success '--only works on to-be-born branch' '
598 # This test relies on having something in the index, as it
599 # would not otherwise actually prove much. So check this.
600 test -n "$(git ls-files)" &&
601 git checkout --orphan orphan &&
602 echo foo >newfile &&
603 git add newfile &&
604 git commit --only newfile -m"--only on unborn branch" &&
605 echo newfile >expected &&
606 git ls-tree -r --name-only HEAD >actual &&
607 test_cmp expected actual
608 '
609
610 test_done