@matheusbsbs / matheus-bagliano / commits / a908a31c34

commit: add tests of commit races

Committing involves the following steps: 1. Determine the current value of HEAD (if any). 2. Create the new commit object. 3. Update HEAD. Please note that step 2 can take arbitrarily long, because it might involve the user editing a commit message. If a second process sneaks in a commit during step 2, then the first commit process should fail. This is usually done correctly, because step 3 verifies that HEAD still points at the same commit that it pointed to during step 1. However, if there is a race when creating an *orphan* commit, then the test in step 3 is skipped. Add tests for proper handling of such races. One of the new tests fails. It will be fixed in a moment. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed Feb 17, 2015 at 18:00 UTC a908a31c344cdcce2bf1a9fc163f3bccd2349e6a
1 file changed +30
t/t7516-commit-races.sh new
+30
@@ -0,0 +1,30 @@
1 +#!/bin/sh
2 +
3 +test_description='git commit races'
4 +. ./test-lib.sh
5 +
6 +test_expect_failure 'race to create orphan commit' '
7 + write_script hare-editor <<-\EOF &&
8 + git commit --allow-empty -m hare
9 + EOF
10 + test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
11 + git show -s --pretty=format:%s >subject &&
12 + grep hare subject &&
13 + test -z "$(git show -s --pretty=format:%P)"
14 +'
15 +
16 +test_expect_success 'race to create non-orphan commit' '
17 + write_script airplane-editor <<-\EOF &&
18 + git commit --allow-empty -m airplane
19 + EOF
20 + git checkout --orphan branch &&
21 + git commit --allow-empty -m base &&
22 + git rev-parse HEAD >base &&
23 + test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
24 + git show -s --pretty=format:%s >subject &&
25 + grep airplane subject &&
26 + git rev-parse HEAD^ >parent &&
27 + test_cmp base parent
28 +'
29 +
30 +test_done