From: Stefan Beller <sbeller@google.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v2 06/12] commit: add tests of commit races
Date: Thu, 12 Feb 2015 10:13:51 -0800 [thread overview]
Message-ID: <CAGZ79kbz5+CNO3fgy+UyY1z45a+cTkhtroRbHSNdmUWdQdKeqQ@mail.gmail.com> (raw)
In-Reply-To: <1423739543-1025-7-git-send-email-mhagger@alum.mit.edu>
On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> 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>
> ---
> t/t7516-commit-races.sh | 33 +++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100755 t/t7516-commit-races.sh
>
> diff --git a/t/t7516-commit-races.sh b/t/t7516-commit-races.sh
> new file mode 100755
> index 0000000..08e6a6c
> --- /dev/null
> +++ b/t/t7516-commit-races.sh
> @@ -0,0 +1,33 @@
> +#!/bin/sh
> +
> +test_description='git commit races'
> +. ./test-lib.sh
> +
> +test_tick
So I am wondering why we need to have a test_tick here.
In case we need to pass simulation time after loading the
test-lib, we should rather have it inside the test-lib.
If we need to pass time specifically for this test (I just don't
understand why at this point of execution), then we should
move it more to the relevant place inside the &&-chain as all
other tests have test_tick inside a test chained up with &&.
> +
> +test_expect_success 'set up editor' '
> + write_script editor <<-\EOF
> + git commit --allow-empty -m hare
> + echo tortoise >"$1"
> + EOF
> +'
> +
> +test_expect_failure 'race to create orphan commit' '
> + test_must_fail env EDITOR=./editor git commit --allow-empty &&
> + git show -s --pretty=format:%s >subject &&
> + grep -q hare subject &&
> + test -z "$(git show -s --pretty=format:%P)"
> +'
> +
> +test_expect_success 'race to create non-orphan commit' '
> + git checkout --orphan branch &&
> + git commit --allow-empty -m base &&
> + git rev-parse HEAD >base &&
> + test_must_fail env EDITOR=./editor git commit --allow-empty &&
> + git show -s --pretty=format:%s >subject &&
> + grep -q hare subject &&
> + git rev-parse HEAD^ >parent &&
> + test_cmp base parent
> +'
> +
> +test_done
> --
> 2.1.4
>
next prev parent reply other threads:[~2015-02-12 18:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 11:12 [PATCH v2 00/12] Allow reference values to be checked in a transaction Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 01/12] refs: move REF_DELETING to refs.c Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 02/12] refs: remove the gap in the REF_* constant values Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 03/12] struct ref_update: move "have_old" into "flags" Michael Haggerty
2015-02-12 18:08 ` Stefan Beller
2015-02-12 19:15 ` Junio C Hamano
2015-02-17 14:37 ` Michael Haggerty
2015-02-17 15:52 ` Junio C Hamano
2015-02-12 11:12 ` [PATCH v2 04/12] ref_transaction_update(): remove "have_old" parameter Michael Haggerty
2015-02-12 17:32 ` Junio C Hamano
2015-02-13 17:15 ` Michael Haggerty
2015-02-13 18:27 ` Junio C Hamano
2015-02-12 11:12 ` [PATCH v2 05/12] ref_transaction_delete(): " Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 06/12] commit: add tests of commit races Michael Haggerty
2015-02-12 18:13 ` Stefan Beller [this message]
2015-02-17 14:44 ` Michael Haggerty
2015-02-12 19:36 ` Junio C Hamano
2015-02-17 15:06 ` Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 07/12] commit: avoid race when creating orphan commits Michael Haggerty
2015-02-12 19:36 ` Junio C Hamano
2015-02-12 11:12 ` [PATCH v2 08/12] ref_transaction_create(): check that new_sha1 is valid Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 09/12] ref_transaction_delete(): check that old_sha1 is not null_sha1 Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 10/12] ref_transaction_verify(): new function to check a reference's value Michael Haggerty
2015-02-12 18:21 ` Stefan Beller
2015-02-12 11:12 ` [PATCH v2 11/12] update_ref(): improve documentation Michael Haggerty
2015-02-12 11:12 ` [PATCH v2 12/12] refs.h: Remove duplication in function docstrings Michael Haggerty
2015-02-12 19:44 ` [PATCH v2 00/12] Allow reference values to be checked in a transaction Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kbz5+CNO3fgy+UyY1z45a+cTkhtroRbHSNdmUWdQdKeqQ@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=ronniesahlberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).