]>
Commit | Line | Data |
---|---|---|
12ace0b2 KH |
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, | |
264474f2 | 7 | # signoff |
12ace0b2 | 8 | |
47a528ad | 9 | test_description='git commit' |
12ace0b2 | 10 | . ./test-lib.sh |
1af524eb | 11 | . "$TEST_DIRECTORY/diff-lib.sh" |
12ace0b2 | 12 | |
1af524eb | 13 | author='The Real Author <someguy@his.email.org>' |
12ace0b2 | 14 | |
1af524eb | 15 | test_tick |
b3b298af | 16 | |
1af524eb JN |
17 | test_expect_success 'initial status' ' |
18 | echo bongo bongo >file && | |
19 | git add file && | |
32177ba6 | 20 | git status >actual && |
4ddb1354 | 21 | test_i18ngrep "No commits yet" actual |
32177ba6 | 22 | ' |
12ace0b2 | 23 | |
1af524eb JN |
24 | test_expect_success 'fail initial amend' ' |
25 | test_must_fail git commit --amend | |
26 | ' | |
12ace0b2 | 27 | |
1af524eb JN |
28 | test_expect_success 'setup: initial commit' ' |
29 | git commit -m initial | |
30 | ' | |
12ace0b2 | 31 | |
1af524eb | 32 | test_expect_success '-m and -F do not mix' ' |
c65dc351 | 33 | git checkout HEAD file && echo >>file && git add file && |
1af524eb JN |
34 | test_must_fail git commit -m foo -m bar -F file |
35 | ' | |
12ace0b2 | 36 | |
1af524eb | 37 | test_expect_success '-m and -C do not mix' ' |
c65dc351 | 38 | git checkout HEAD file && echo >>file && git add file && |
1af524eb JN |
39 | test_must_fail git commit -C HEAD -m illegal |
40 | ' | |
12ace0b2 | 41 | |
1af524eb JN |
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 | ' | |
9d87442f | 46 | |
e41fcfe9 | 47 | test_expect_success PERL 'can use paths with --interactive' ' |
587ac8c9 JK |
48 | echo bong-o-bong >file && |
49 | # 2: update, 1:st path, that is all, 7: quit | |
0590ff26 | 50 | test_write_lines 2 1 "" 7 | |
e41fcfe9 CI |
51 | git commit -m foo --interactive file && |
52 | git reset --hard HEAD^ | |
587ac8c9 | 53 | ' |
9d87442f | 54 | |
86238e07 BW |
55 | test_expect_success 'removed files and relative paths' ' |
56 | test_when_finished "rm -rf foo" && | |
57 | git init foo && | |
58 | >foo/foo.txt && | |
59 | git -C foo add foo.txt && | |
60 | git -C foo commit -m first && | |
61 | git -C foo rm foo.txt && | |
62 | ||
63 | mkdir -p foo/bar && | |
64 | git -C foo/bar commit -m second ../foo.txt | |
65 | ' | |
66 | ||
1af524eb | 67 | test_expect_success 'using invalid commit with -C' ' |
0bb0c155 | 68 | test_must_fail git commit --allow-empty -C bogus |
1af524eb | 69 | ' |
12ace0b2 | 70 | |
1af524eb | 71 | test_expect_success 'nothing to commit' ' |
088304bf | 72 | git reset --hard && |
1af524eb JN |
73 | test_must_fail git commit -m initial |
74 | ' | |
12ace0b2 | 75 | |
9cbcc2a7 TRC |
76 | test_expect_success '--dry-run fails with nothing to commit' ' |
77 | test_must_fail git commit -m initial --dry-run | |
78 | ' | |
79 | ||
80 | test_expect_success '--short fails with nothing to commit' ' | |
81 | test_must_fail git commit -m initial --short | |
82 | ' | |
83 | ||
84 | test_expect_success '--porcelain fails with nothing to commit' ' | |
85 | test_must_fail git commit -m initial --porcelain | |
86 | ' | |
87 | ||
88 | test_expect_success '--long fails with nothing to commit' ' | |
89 | test_must_fail git commit -m initial --long | |
90 | ' | |
91 | ||
1af524eb JN |
92 | test_expect_success 'setup: non-initial commit' ' |
93 | echo bongo bongo bongo >file && | |
94 | git commit -m next -a | |
95 | ' | |
12ace0b2 | 96 | |
9cbcc2a7 TRC |
97 | test_expect_success '--dry-run with stuff to commit returns ok' ' |
98 | echo bongo bongo bongo >>file && | |
99 | git commit -m next -a --dry-run | |
100 | ' | |
101 | ||
f3bd35fa | 102 | test_expect_success '--short with stuff to commit returns ok' ' |
9cbcc2a7 TRC |
103 | echo bongo bongo bongo >>file && |
104 | git commit -m next -a --short | |
105 | ' | |
106 | ||
f3bd35fa | 107 | test_expect_success '--porcelain with stuff to commit returns ok' ' |
9cbcc2a7 TRC |
108 | echo bongo bongo bongo >>file && |
109 | git commit -m next -a --porcelain | |
110 | ' | |
111 | ||
112 | test_expect_success '--long with stuff to commit returns ok' ' | |
113 | echo bongo bongo bongo >>file && | |
114 | git commit -m next -a --long | |
115 | ' | |
116 | ||
1af524eb JN |
117 | test_expect_success 'commit message from non-existing file' ' |
118 | echo more bongo: bongo bongo bongo bongo >file && | |
119 | test_must_fail git commit -F gah -a | |
120 | ' | |
12ace0b2 | 121 | |
1af524eb JN |
122 | test_expect_success 'empty commit message' ' |
123 | # Empty except stray tabs and spaces on a few lines. | |
124 | sed -e "s/@//g" >msg <<-\EOF && | |
125 | @ @ | |
126 | @@ | |
127 | @ @ | |
128 | @Signed-off-by: hula@ | |
129 | EOF | |
130 | test_must_fail git commit -F msg -a | |
131 | ' | |
12ace0b2 | 132 | |
010c7dbc JH |
133 | test_expect_success 'template "emptyness" check does not kick in with -F' ' |
134 | git checkout HEAD file && echo >>file && git add file && | |
135 | git commit -t file -F file | |
136 | ' | |
137 | ||
b2eda9bd JH |
138 | test_expect_success 'template "emptyness" check' ' |
139 | git checkout HEAD file && echo >>file && git add file && | |
140 | test_must_fail git commit -t file 2>err && | |
141 | test_i18ngrep "did not edit" err | |
142 | ' | |
143 | ||
1af524eb | 144 | test_expect_success 'setup: commit message from file' ' |
010c7dbc | 145 | git checkout HEAD file && echo >>file && git add file && |
1af524eb JN |
146 | echo this is the commit message, coming from a file >msg && |
147 | git commit -F msg -a | |
148 | ' | |
12ace0b2 | 149 | |
1af524eb JN |
150 | test_expect_success 'amend commit' ' |
151 | cat >editor <<-\EOF && | |
152 | #!/bin/sh | |
38c1aa01 | 153 | sed -e "s/a file/an amend commit/g" <"$1" >"$1-" |
1af524eb JN |
154 | mv "$1-" "$1" |
155 | EOF | |
156 | chmod 755 editor && | |
157 | EDITOR=./editor git commit --amend | |
158 | ' | |
12ace0b2 | 159 | |
ea2d4ed3 JK |
160 | test_expect_success 'amend --only ignores staged contents' ' |
161 | cp file file.expect && | |
162 | echo changed >file && | |
163 | git add file && | |
164 | git commit --no-edit --amend --only && | |
165 | git cat-file blob HEAD:file >file.actual && | |
166 | test_cmp file.expect file.actual && | |
167 | git diff --exit-code | |
168 | ' | |
169 | ||
319d8352 AK |
170 | test_expect_success 'allow-empty --only ignores staged contents' ' |
171 | echo changed-again >file && | |
172 | git add file && | |
173 | git commit --allow-empty --only -m "empty" && | |
174 | git cat-file blob HEAD:file >file.actual && | |
175 | test_cmp file.expect file.actual && | |
ea2d4ed3 JK |
176 | git diff --exit-code |
177 | ' | |
178 | ||
bc821899 JN |
179 | test_expect_success 'set up editor' ' |
180 | cat >editor <<-\EOF && | |
181 | #!/bin/sh | |
182 | sed -e "s/unamended/amended/g" <"$1" >"$1-" | |
183 | mv "$1-" "$1" | |
184 | EOF | |
185 | chmod 755 editor | |
186 | ' | |
187 | ||
188 | test_expect_success 'amend without launching editor' ' | |
189 | echo unamended >expect && | |
190 | git commit --allow-empty -m "unamended" && | |
191 | echo needs more bongo >file && | |
192 | git add file && | |
193 | EDITOR=./editor git commit --no-edit --amend && | |
194 | git diff --exit-code HEAD -- file && | |
195 | git diff-tree -s --format=%s HEAD >msg && | |
196 | test_cmp expect msg | |
197 | ' | |
198 | ||
199 | test_expect_success '--amend --edit' ' | |
200 | echo amended >expect && | |
201 | git commit --allow-empty -m "unamended" && | |
202 | echo bongo again >file && | |
203 | git add file && | |
204 | EDITOR=./editor git commit --edit --amend && | |
205 | git diff-tree -s --format=%s HEAD >msg && | |
206 | test_cmp expect msg | |
207 | ' | |
208 | ||
d9a93575 CW |
209 | test_expect_success '--amend --edit of empty message' ' |
210 | cat >replace <<-\EOF && | |
211 | #!/bin/sh | |
212 | echo "amended" >"$1" | |
213 | EOF | |
214 | chmod 755 replace && | |
215 | git commit --allow-empty --allow-empty-message -m "" && | |
216 | echo more bongo >file && | |
217 | git add file && | |
218 | EDITOR=./replace git commit --edit --amend && | |
219 | git diff-tree -s --format=%s HEAD >msg && | |
220 | ./replace expect && | |
221 | test_cmp expect msg | |
222 | ' | |
223 | ||
27014cbc JK |
224 | test_expect_success '--amend to set message to empty' ' |
225 | echo bata >file && | |
178e8143 AD |
226 | git add file && |
227 | git commit -m "unamended" && | |
228 | git commit --amend --allow-empty-message -m "" && | |
229 | git diff-tree -s --format=%s HEAD >msg && | |
230 | echo "" >expect && | |
231 | test_cmp expect msg | |
232 | ' | |
233 | ||
27014cbc | 234 | test_expect_success '--amend to set empty message needs --allow-empty-message' ' |
178e8143 AD |
235 | echo conga >file && |
236 | git add file && | |
237 | git commit -m "unamended" && | |
238 | test_must_fail git commit --amend -m "" && | |
239 | git diff-tree -s --format=%s HEAD >msg && | |
240 | echo "unamended" >expect && | |
241 | test_cmp expect msg | |
242 | ' | |
243 | ||
bc821899 JN |
244 | test_expect_success '-m --edit' ' |
245 | echo amended >expect && | |
246 | git commit --allow-empty -m buffer && | |
247 | echo bongo bongo >file && | |
248 | git add file && | |
249 | EDITOR=./editor git commit -m unamended --edit && | |
250 | git diff-tree -s --format=%s HEAD >msg && | |
251 | test_cmp expect msg | |
252 | ' | |
253 | ||
1af524eb JN |
254 | test_expect_success '-m and -F do not mix' ' |
255 | echo enough with the bongos >file && | |
256 | test_must_fail git commit -F msg -m amending . | |
257 | ' | |
258 | ||
259 | test_expect_success 'using message from other commit' ' | |
260 | git commit -C HEAD^ . | |
261 | ' | |
12ace0b2 | 262 | |
1af524eb JN |
263 | test_expect_success 'editing message from other commit' ' |
264 | cat >editor <<-\EOF && | |
265 | #!/bin/sh | |
38c1aa01 | 266 | sed -e "s/amend/older/g" <"$1" >"$1-" |
1af524eb JN |
267 | mv "$1-" "$1" |
268 | EOF | |
269 | chmod 755 editor && | |
270 | echo hula hula >file && | |
271 | EDITOR=./editor git commit -c HEAD^ -a | |
272 | ' | |
12ace0b2 | 273 | |
1af524eb JN |
274 | test_expect_success 'message from stdin' ' |
275 | echo silly new contents >file && | |
276 | echo commit message from stdin | | |
277 | git commit -F - -a | |
278 | ' | |
12ace0b2 | 279 | |
1af524eb JN |
280 | test_expect_success 'overriding author from command line' ' |
281 | echo gak >file && | |
282 | git commit -m author \ | |
283 | --author "Rubber Duck <rduck@convoy.org>" -a >output 2>&1 && | |
284 | grep Rubber.Duck output | |
285 | ' | |
12ace0b2 | 286 | |
1af524eb | 287 | test_expect_success PERL 'interactive add' ' |
756ee7fc DL |
288 | echo 7 | test_must_fail git commit --interactive >out && |
289 | grep "What now" out | |
1af524eb JN |
290 | ' |
291 | ||
292 | test_expect_success PERL "commit --interactive doesn't change index if editor aborts" ' | |
293 | echo zoo >file && | |
02a481fc | 294 | test_must_fail git diff --exit-code >diff1 && |
0590ff26 | 295 | test_write_lines u "*" q | |
1af524eb JN |
296 | ( |
297 | EDITOR=: && | |
298 | export EDITOR && | |
299 | test_must_fail git commit --interactive | |
300 | ) && | |
02a481fc | 301 | git diff >diff2 && |
1af524eb JN |
302 | compare_diff_patch diff1 diff2 |
303 | ' | |
12ace0b2 | 304 | |
1af524eb JN |
305 | test_expect_success 'editor not invoked if -F is given' ' |
306 | cat >editor <<-\EOF && | |
307 | #!/bin/sh | |
308 | sed -e s/good/bad/g <"$1" >"$1-" | |
309 | mv "$1-" "$1" | |
310 | EOF | |
311 | chmod 755 editor && | |
312 | ||
313 | echo A good commit message. >msg && | |
314 | echo moo >file && | |
315 | ||
316 | EDITOR=./editor git commit -a -F msg && | |
317 | git show -s --pretty=format:%s >subject && | |
318 | grep -q good subject && | |
319 | ||
320 | echo quack >file && | |
321 | echo Another good message. | | |
322 | EDITOR=./editor git commit -a -F - && | |
323 | git show -s --pretty=format:%s >subject && | |
324 | grep -q good subject | |
325 | ' | |
12ace0b2 | 326 | |
db33af0a | 327 | test_expect_success 'partial commit that involves removal (1)' ' |
80bffaf7 JH |
328 | |
329 | git rm --cached file && | |
330 | mv file elif && | |
331 | git add elif && | |
332 | git commit -m "Partial: add elif" elif && | |
333 | git diff-tree --name-status HEAD^ HEAD >current && | |
334 | echo "A elif" >expected && | |
1e368681 | 335 | test_cmp expected current |
80bffaf7 JH |
336 | |
337 | ' | |
338 | ||
db33af0a | 339 | test_expect_success 'partial commit that involves removal (2)' ' |
80bffaf7 JH |
340 | |
341 | git commit -m "Partial: remove file" file && | |
342 | git diff-tree --name-status HEAD^ HEAD >current && | |
343 | echo "D file" >expected && | |
1e368681 | 344 | test_cmp expected current |
80bffaf7 JH |
345 | |
346 | ' | |
347 | ||
db33af0a JH |
348 | test_expect_success 'partial commit that involves removal (3)' ' |
349 | ||
350 | git rm --cached elif && | |
351 | echo elif >elif && | |
352 | git commit -m "Partial: modify elif" elif && | |
353 | git diff-tree --name-status HEAD^ HEAD >current && | |
354 | echo "M elif" >expected && | |
1e368681 | 355 | test_cmp expected current |
db33af0a JH |
356 | |
357 | ' | |
358 | ||
5aa5cd46 JH |
359 | test_expect_success 'amend commit to fix author' ' |
360 | ||
361 | oldtick=$GIT_AUTHOR_DATE && | |
362 | test_tick && | |
363 | git reset --hard && | |
756ee7fc | 364 | git cat-file -p HEAD >commit && |
5aa5cd46 | 365 | sed -e "s/author.*/author $author $oldtick/" \ |
756ee7fc DL |
366 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ |
367 | commit >expected && | |
5aa5cd46 | 368 | git commit --amend --author="$author" && |
38c1aa01 | 369 | git cat-file -p HEAD >current && |
1e368681 | 370 | test_cmp expected current |
5aa5cd46 JH |
371 | |
372 | ' | |
373 | ||
02b47cd7 MV |
374 | test_expect_success 'amend commit to fix date' ' |
375 | ||
376 | test_tick && | |
377 | newtick=$GIT_AUTHOR_DATE && | |
378 | git reset --hard && | |
756ee7fc | 379 | git cat-file -p HEAD >commit && |
02b47cd7 | 380 | sed -e "s/author.*/author $author $newtick/" \ |
756ee7fc DL |
381 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ |
382 | commit >expected && | |
02b47cd7 | 383 | git commit --amend --date="$newtick" && |
38c1aa01 | 384 | git cat-file -p HEAD >current && |
02b47cd7 MV |
385 | test_cmp expected current |
386 | ||
387 | ' | |
388 | ||
b7242b8c JK |
389 | test_expect_success 'commit mentions forced date in output' ' |
390 | git commit --amend --date=2010-01-02T03:04:05 >output && | |
391 | grep "Date: *Sat Jan 2 03:04:05 2010" output | |
392 | ' | |
393 | ||
14ac2864 JK |
394 | test_expect_success 'commit complains about completely bogus dates' ' |
395 | test_must_fail git commit --amend --date=seventeen | |
396 | ' | |
397 | ||
398 | test_expect_success 'commit --date allows approxidate' ' | |
399 | git commit --amend \ | |
400 | --date="midnight the 12th of october, anno domini 1979" && | |
401 | echo "Fri Oct 12 00:00:00 1979 +0000" >expect && | |
402 | git log -1 --format=%ad >actual && | |
403 | test_cmp expect actual | |
4579bb41 JK |
404 | ' |
405 | ||
5aa5cd46 JH |
406 | test_expect_success 'sign off (1)' ' |
407 | ||
408 | echo 1 >positive && | |
409 | git add positive && | |
410 | git commit -s -m "thank you" && | |
756ee7fc DL |
411 | git cat-file commit HEAD >commit && |
412 | sed -e "1,/^\$/d" commit >actual && | |
5aa5cd46 | 413 | ( |
e974e06d ES |
414 | echo thank you && |
415 | echo && | |
756ee7fc DL |
416 | git var GIT_COMMITTER_IDENT >ident && |
417 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident | |
5aa5cd46 | 418 | ) >expected && |
82ebb0b6 | 419 | test_cmp expected actual |
5aa5cd46 JH |
420 | |
421 | ' | |
422 | ||
423 | test_expect_success 'sign off (2)' ' | |
424 | ||
425 | echo 2 >positive && | |
426 | git add positive && | |
427 | existing="Signed-off-by: Watch This <watchthis@example.com>" && | |
428 | git commit -s -m "thank you | |
429 | ||
430 | $existing" && | |
756ee7fc DL |
431 | git cat-file commit HEAD >commit && |
432 | sed -e "1,/^\$/d" commit >actual && | |
5aa5cd46 | 433 | ( |
e974e06d ES |
434 | echo thank you && |
435 | echo && | |
436 | echo $existing && | |
756ee7fc DL |
437 | git var GIT_COMMITTER_IDENT >ident && |
438 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident | |
5aa5cd46 | 439 | ) >expected && |
82ebb0b6 | 440 | test_cmp expected actual |
5aa5cd46 JH |
441 | |
442 | ' | |
443 | ||
c1e01b0c DB |
444 | test_expect_success 'signoff gap' ' |
445 | ||
446 | echo 3 >positive && | |
447 | git add positive && | |
448 | alt="Alt-RFC-822-Header: Value" && | |
449 | git commit -s -m "welcome | |
450 | ||
451 | $alt" && | |
756ee7fc DL |
452 | git cat-file commit HEAD >commit && |
453 | sed -e "1,/^\$/d" commit >actual && | |
c1e01b0c | 454 | ( |
e974e06d ES |
455 | echo welcome && |
456 | echo && | |
457 | echo $alt && | |
756ee7fc DL |
458 | git var GIT_COMMITTER_IDENT >ident && |
459 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident | |
c1e01b0c DB |
460 | ) >expected && |
461 | test_cmp expected actual | |
462 | ' | |
463 | ||
464 | test_expect_success 'signoff gap 2' ' | |
465 | ||
466 | echo 4 >positive && | |
467 | git add positive && | |
468 | alt="fixed: 34" && | |
469 | git commit -s -m "welcome | |
470 | ||
471 | We have now | |
472 | $alt" && | |
756ee7fc DL |
473 | git cat-file commit HEAD >commit && |
474 | sed -e "1,/^\$/d" commit >actual && | |
c1e01b0c | 475 | ( |
e974e06d ES |
476 | echo welcome && |
477 | echo && | |
478 | echo We have now && | |
479 | echo $alt && | |
480 | echo && | |
756ee7fc DL |
481 | git var GIT_COMMITTER_IDENT >ident && |
482 | sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident | |
c1e01b0c DB |
483 | ) >expected && |
484 | test_cmp expected actual | |
485 | ' | |
486 | ||
967dfd4d JT |
487 | test_expect_success 'signoff respects trailer config' ' |
488 | ||
489 | echo 5 >positive && | |
490 | git add positive && | |
491 | git commit -s -m "subject | |
492 | ||
493 | non-trailer line | |
494 | Myfooter: x" && | |
756ee7fc DL |
495 | git cat-file commit HEAD >commit && |
496 | sed -e "1,/^\$/d" commit >actual && | |
967dfd4d | 497 | ( |
e974e06d ES |
498 | echo subject && |
499 | echo && | |
500 | echo non-trailer line && | |
501 | echo Myfooter: x && | |
502 | echo && | |
967dfd4d JT |
503 | echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" |
504 | ) >expected && | |
505 | test_cmp expected actual && | |
506 | ||
507 | echo 6 >positive && | |
508 | git add positive && | |
509 | git -c "trailer.Myfooter.ifexists=add" commit -s -m "subject | |
510 | ||
511 | non-trailer line | |
512 | Myfooter: x" && | |
756ee7fc DL |
513 | git cat-file commit HEAD >commit && |
514 | sed -e "1,/^\$/d" commit >actual && | |
967dfd4d | 515 | ( |
e974e06d ES |
516 | echo subject && |
517 | echo && | |
518 | echo non-trailer line && | |
519 | echo Myfooter: x && | |
967dfd4d JT |
520 | echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" |
521 | ) >expected && | |
522 | test_cmp expected actual | |
523 | ' | |
524 | ||
ffce7f59 JK |
525 | test_expect_success 'signoff not confused by ---' ' |
526 | cat >expected <<-EOF && | |
527 | subject | |
528 | ||
529 | body | |
530 | --- | |
531 | these dashes confuse the parser! | |
532 | ||
533 | Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> | |
534 | EOF | |
535 | # should be a noop, since we already signed | |
536 | git commit --allow-empty --signoff -F expected && | |
537 | git log -1 --pretty=format:%B >actual && | |
538 | test_cmp expected actual | |
539 | ' | |
540 | ||
5aa5cd46 JH |
541 | test_expect_success 'multiple -m' ' |
542 | ||
543 | >negative && | |
544 | git add negative && | |
545 | git commit -m "one" -m "two" -m "three" && | |
756ee7fc DL |
546 | git cat-file commit HEAD >commit && |
547 | sed -e "1,/^\$/d" commit >actual && | |
5aa5cd46 | 548 | ( |
e974e06d ES |
549 | echo one && |
550 | echo && | |
551 | echo two && | |
552 | echo && | |
5aa5cd46 JH |
553 | echo three |
554 | ) >expected && | |
82ebb0b6 | 555 | test_cmp expected actual |
5aa5cd46 JH |
556 | |
557 | ' | |
558 | ||
d63c2fd1 KH |
559 | test_expect_success 'amend commit to fix author' ' |
560 | ||
561 | oldtick=$GIT_AUTHOR_DATE && | |
562 | test_tick && | |
563 | git reset --hard && | |
756ee7fc | 564 | git cat-file -p HEAD >commit && |
d63c2fd1 | 565 | sed -e "s/author.*/author $author $oldtick/" \ |
756ee7fc DL |
566 | -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ |
567 | commit >expected && | |
d63c2fd1 | 568 | git commit --amend --author="$author" && |
38c1aa01 | 569 | git cat-file -p HEAD >current && |
1e368681 | 570 | test_cmp expected current |
d63c2fd1 KH |
571 | |
572 | ' | |
1200993a KH |
573 | |
574 | test_expect_success 'git commit <file> with dirty index' ' | |
38c1aa01 DL |
575 | echo tacocat >elif && |
576 | echo tehlulz >chz && | |
1200993a KH |
577 | git add chz && |
578 | git commit elif -m "tacocat is a palindrome" && | |
756ee7fc DL |
579 | git show --stat >stat && |
580 | grep elif stat && | |
581 | git diff --cached >diff && | |
582 | grep chz diff | |
1200993a KH |
583 | ' |
584 | ||
13aba1e5 JS |
585 | test_expect_success 'same tree (single parent)' ' |
586 | ||
1af524eb JN |
587 | git reset --hard && |
588 | test_must_fail git commit -m empty | |
13aba1e5 JS |
589 | |
590 | ' | |
591 | ||
36863af1 JH |
592 | test_expect_success 'same tree (single parent) --allow-empty' ' |
593 | ||
594 | git commit --allow-empty -m "forced empty" && | |
756ee7fc DL |
595 | git cat-file commit HEAD >commit && |
596 | grep forced commit | |
36863af1 JH |
597 | |
598 | ' | |
599 | ||
13aba1e5 JS |
600 | test_expect_success 'same tree (merge and amend merge)' ' |
601 | ||
602 | git checkout -b side HEAD^ && | |
603 | echo zero >zero && | |
604 | git add zero && | |
605 | git commit -m "add zero" && | |
606 | git checkout master && | |
607 | ||
608 | git merge -s ours side -m "empty ok" && | |
609 | git diff HEAD^ HEAD >actual && | |
1c5e94f4 | 610 | test_must_be_empty actual && |
13aba1e5 JS |
611 | |
612 | git commit --amend -m "empty really ok" && | |
613 | git diff HEAD^ HEAD >actual && | |
1c5e94f4 | 614 | test_must_be_empty actual |
13aba1e5 JS |
615 | |
616 | ' | |
617 | ||
1eb1e9ee JH |
618 | test_expect_success 'amend using the message from another commit' ' |
619 | ||
620 | git reset --hard && | |
621 | test_tick && | |
622 | git commit --allow-empty -m "old commit" && | |
623 | old=$(git rev-parse --verify HEAD) && | |
624 | test_tick && | |
625 | git commit --allow-empty -m "new commit" && | |
626 | new=$(git rev-parse --verify HEAD) && | |
627 | test_tick && | |
628 | git commit --allow-empty --amend -C "$old" && | |
629 | git show --pretty="format:%ad %s" "$old" >expected && | |
630 | git show --pretty="format:%ad %s" HEAD >actual && | |
82ebb0b6 | 631 | test_cmp expected actual |
1eb1e9ee JH |
632 | |
633 | ' | |
634 | ||
8a2f8733 JH |
635 | test_expect_success 'amend using the message from a commit named with tag' ' |
636 | ||
637 | git reset --hard && | |
638 | test_tick && | |
639 | git commit --allow-empty -m "old commit" && | |
640 | old=$(git rev-parse --verify HEAD) && | |
641 | git tag -a -m "tag on old" tagged-old HEAD && | |
642 | test_tick && | |
643 | git commit --allow-empty -m "new commit" && | |
644 | new=$(git rev-parse --verify HEAD) && | |
645 | test_tick && | |
646 | git commit --allow-empty --amend -C tagged-old && | |
647 | git show --pretty="format:%ad %s" "$old" >expected && | |
648 | git show --pretty="format:%ad %s" HEAD >actual && | |
82ebb0b6 | 649 | test_cmp expected actual |
8a2f8733 JH |
650 | |
651 | ' | |
652 | ||
6360d343 TR |
653 | test_expect_success 'amend can copy notes' ' |
654 | ||
655 | git config notes.rewrite.amend true && | |
656 | git config notes.rewriteRef "refs/notes/*" && | |
657 | test_commit foo && | |
658 | git notes add -m"a note" && | |
659 | test_tick && | |
660 | git commit --amend -m"new foo" && | |
661 | test "$(git notes show)" = "a note" | |
662 | ||
663 | ' | |
664 | ||
4682d852 JH |
665 | test_expect_success 'commit a file whose name is a dash' ' |
666 | git reset --hard && | |
667 | for i in 1 2 3 4 5 | |
668 | do | |
669 | echo $i | |
670 | done >./- && | |
671 | git add ./- && | |
672 | test_tick && | |
673 | git commit -m "add dash" >output </dev/null && | |
674 | test_i18ngrep " changed, 5 insertions" output | |
675 | ' | |
676 | ||
f0c73200 TR |
677 | test_expect_success '--only works on to-be-born branch' ' |
678 | # This test relies on having something in the index, as it | |
679 | # would not otherwise actually prove much. So check this. | |
680 | test -n "$(git ls-files)" && | |
681 | git checkout --orphan orphan && | |
682 | echo foo >newfile && | |
683 | git add newfile && | |
684 | git commit --only newfile -m"--only on unborn branch" && | |
685 | echo newfile >expected && | |
686 | git ls-tree -r --name-only HEAD >actual && | |
687 | test_cmp expected actual | |
688 | ' | |
689 | ||
8dc874b2 SS |
690 | test_expect_success '--dry-run with conflicts fixed from a merge' ' |
691 | # setup two branches with conflicting information | |
692 | # in the same file, resolve the conflict, | |
693 | # call commit with --dry-run | |
694 | echo "Initial contents, unimportant" >test-file && | |
695 | git add test-file && | |
696 | git commit -m "Initial commit" && | |
697 | echo "commit-1-state" >test-file && | |
698 | git commit -m "commit 1" -i test-file && | |
699 | git tag commit-1 && | |
700 | git checkout -b branch-2 HEAD^1 && | |
701 | echo "commit-2-state" >test-file && | |
702 | git commit -m "commit 2" -i test-file && | |
15da7537 | 703 | test_must_fail git merge --no-commit commit-1 && |
8dc874b2 SS |
704 | echo "commit-2-state" >test-file && |
705 | git add test-file && | |
706 | git commit --dry-run && | |
707 | git commit -m "conflicts fixed from merge." | |
708 | ' | |
709 | ||
f3bd35fa | 710 | test_expect_success '--dry-run --short' ' |
8282f59f SS |
711 | >test-file && |
712 | git add test-file && | |
713 | git commit --dry-run --short | |
714 | ' | |
715 | ||
12ace0b2 | 716 | test_done |