From: Clemens Buchacher <drizzd@aon.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>, git@vger.kernel.org
Subject: Re: [PATCH] use persistent memory for rejected paths
Date: Tue, 16 Nov 2010 00:30:49 +0100 [thread overview]
Message-ID: <20101115233049.GA4782@localhost> (raw)
In-Reply-To: <7v62vyjiho.fsf@alter.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 959 bytes --]
On Mon, Nov 15, 2010 at 03:05:07PM -0800, Junio C Hamano wrote:
> Clemens Buchacher <drizzd@aon.at> writes:
> > You don't have to take my word for it, just try the test. It should
> > be failing nicely. :-)
>
> As far as I remember the tests were about the output order and never about
> "ah we are showing stale contents from stack" (which is rather hard to
> arrange for reliable testing anyway).
I changed t7607 to reject two paths 'sub' and 'sub2' and test the
output. Without the fix, the output is
error: The following untracked working tree files would be overwritten by
merge:
sub2
sub2
Please move or remove them before you can merge.
since the same buffer is used for both rejected paths. So it does
fail reliably.
Clemens
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
prev parent reply other threads:[~2010-11-15 23:30 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 19:53 What's cooking in git.git (Nov 2010, #01; Tue, 9) Junio C Hamano
2010-11-09 20:11 ` Ævar Arnfjörð Bjarmason
2010-11-09 20:19 ` Matthieu Moy
2010-11-09 20:29 ` Drew Northup
2010-11-09 20:38 ` Jonathan Nieder
2010-11-09 21:38 ` Jakub Narebski
2010-11-11 17:21 ` Junio C Hamano
2010-11-11 23:53 ` Jakub Narebski
2010-11-09 21:46 ` Johan Herland
2010-11-09 22:11 ` Jeff King
2010-11-09 22:17 ` Erik Faye-Lund
2010-11-09 22:21 ` Ævar Arnfjörð Bjarmason
2010-11-09 22:25 ` Erik Faye-Lund
2010-11-09 22:27 ` Ævar Arnfjörð Bjarmason
2010-11-10 20:35 ` Yann Dirson
2010-11-11 12:26 ` Nguyen Thai Ngoc Duy
2010-11-11 14:28 ` Nguyen Thai Ngoc Duy
2010-11-14 13:02 ` [PATCH] use persistent memory for rejected paths Clemens Buchacher
2010-11-15 18:31 ` Junio C Hamano
2010-11-15 19:02 ` Clemens Buchacher
2010-11-15 19:03 ` Matthieu Moy
2010-11-15 19:41 ` Clemens Buchacher
2010-11-15 19:52 ` [PATCH v2] " Clemens Buchacher
2010-11-16 16:41 ` Matthieu Moy
2010-11-15 23:05 ` [PATCH] " Junio C Hamano
2010-11-15 23:30 ` Clemens Buchacher [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101115233049.GA4782@localhost \
--to=drizzd@aon.at \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).