mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
Fix a few miscellaneous cases where: - We lost the "git" exit code via "git ... | grep" - Likewise by having a $(git) argument to git itself - Used "test -z" to check that a command emitted no output, we can use "test_must_be_empty" and &&-chaining instead. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
32 lines
871 B
Bash
Executable file
32 lines
871 B
Bash
Executable file
#!/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 &&
|
|
git show -s --pretty=format:%P >out &&
|
|
test_must_be_empty out
|
|
'
|
|
|
|
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
|