Revision c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a authored by Junio C Hamano on 27 February 2018, 18:43:54 UTC, committed by Junio C Hamano on 27 February 2018, 18:43:54 UTC
"git commit --fixup" did not allow "-m<message>" option to be used at the same time; allow it to annotate resulting commit with more text. * ab/commit-m-with-fixup: commit: add support for --fixup <commit> -m"<extra message>" commit doc: document that -c, -C, -F and --fixup with -m error
t7516-commit-races.sh
#!/bin/sh
test_description='git commit races'
. ./test-lib.sh
test_expect_success 'race to create orphan commit' '
write_script hare-editor <<-\EOF &&
git commit --allow-empty -m hare
EOF
test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
git show -s --pretty=format:%s >subject &&
grep hare subject &&
test -z "$(git show -s --pretty=format:%P)"
'
test_expect_success 'race to create non-orphan commit' '
write_script airplane-editor <<-\EOF &&
git commit --allow-empty -m airplane
EOF
git checkout --orphan branch &&
git commit --allow-empty -m base &&
git rev-parse HEAD >base &&
test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
git show -s --pretty=format:%s >subject &&
grep airplane subject &&
git rev-parse HEAD^ >parent &&
test_cmp base parent
'
test_done
Computing file changes ...
