From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Ben Wijen <ben@wijen.net>,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH 1/2] t6026-merge-attr: child processes must not inherit index.lock handles
Date: Wed, 17 Aug 2016 10:55:46 -0700 [thread overview]
Message-ID: <xmqqh9aj9t5p.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <742a0bc524ac20bf10ccdf9ac51bb01a30efee16.1471437637.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Wed, 17 Aug 2016 14:40:59 +0200 (CEST)")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> From: Ben Wijen <ben@wijen.net>
>
> On Windows, files cannot be removed unless all file handles to it have
s/files/a file/, as the file handles later in the sentence are open
on that single file.
Alternatively s/file handles to it/file handles to them/.
> been released. Hence it is particularly important to close handles when
> spawning children (which would probably not even know that they hold on
> to those handles).
>
> The example chosen for this test is a custom merge driver that indeed
> has no idea that it blocks the deletion of index.lock. The full use case
> is a daemon that lives on after the merge, with subsequent invocations
> handing off to the daemon, thereby avoiding hefty start-up costs. We
> simulate this behavior by simply sleeping one second.
>
> Note that the test only fails on Windows, due to the file locking issue.
> Since we have no way to say "expect failure with MINGW, success
> otherwise", we simply skip this test on Windows for now.
>
> Signed-off-by: Ben Wijen <ben@wijen.net>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
Otherwise, nicely done. Thanks.
> t/t6026-merge-attr.sh | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
> index ef0cbce..3d28c78 100755
> --- a/t/t6026-merge-attr.sh
> +++ b/t/t6026-merge-attr.sh
> @@ -181,4 +181,17 @@ test_expect_success 'up-to-date merge without common ancestor' '
> )
> '
>
> +test_expect_success !MINGW 'custom merge does not lock index' '
> + git reset --hard anchor &&
> + write_script sleep-one-second.sh <<-\EOF &&
> + sleep 1 &
> + EOF
> +
> + test_write_lines >.gitattributes \
> + "* merge=ours" "text merge=sleep-one-second" &&
> + test_config merge.ours.driver true &&
> + test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&
> + git merge master
> +'
> +
> test_done
next prev parent reply other threads:[~2016-08-17 17:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 12:40 [PATCH 0/2] Do not lock temporary files via child processes on Windows Johannes Schindelin
2016-08-17 12:40 ` [PATCH 1/2] t6026-merge-attr: child processes must not inherit index.lock handles Johannes Schindelin
2016-08-17 17:55 ` Junio C Hamano [this message]
2016-08-17 12:41 ` [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes Johannes Schindelin
2016-08-17 12:48 ` Eric Sunshine
2016-08-18 14:42 ` Johannes Schindelin
2016-08-17 13:14 ` Lars Schneider
2016-08-17 18:22 ` Junio C Hamano
2016-08-18 14:50 ` Johannes Schindelin
2016-08-18 17:35 ` Eric Wong
2016-08-18 21:53 ` Junio C Hamano
2016-08-18 22:48 ` Eric Wong
2016-08-19 15:57 ` Junio C Hamano
2016-08-22 12:47 ` Johannes Schindelin
2016-08-18 14:51 ` [PATCH v2 0/2] Do not lock temporary files via child processes on Windows Johannes Schindelin
2016-08-18 14:51 ` [PATCH v2 1/2] t6026-merge-attr: child processes must not inherit index.lock handles Johannes Schindelin
2016-08-18 14:51 ` [PATCH v2 2/2] mingw: ensure temporary file handles are not inherited by child processes Johannes Schindelin
2016-08-22 12:47 ` [PATCH v3 0/2] Do not lock temporary files via child processes on Windows Johannes Schindelin
2016-08-22 12:47 ` [PATCH v3 1/2] t6026-merge-attr: child processes must not inherit index.lock handles Johannes Schindelin
2016-08-22 12:47 ` [PATCH v3 2/2] mingw: ensure temporary file handles are not inherited by child processes Johannes Schindelin
2016-08-22 17:58 ` Eric Wong
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=xmqqh9aj9t5p.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=ben@wijen.net \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=larsxschneider@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).