From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"Stefan Frühwirth" <stefan.fruehwirth@uni-graz.at>,
git@vger.kernel.org
Subject: Re: [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t
Date: Tue, 16 Feb 2016 13:27:07 -0800 [thread overview]
Message-ID: <xmqqmvr0mjmc.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160216055043.GB28237@sigill.intra.peff.net> (Jeff King's message of "Tue, 16 Feb 2016 00:50:43 -0500")
Jeff King <peff@peff.net> writes:
> Yeah, maybe. There were two reasons I avoided adding a test.
>
> One, I secretly hoped that by dragging my feet we could get consensus on
> just ripping out merge-tree entirely. ;)
>
> Two, I'm not sure what the test output _should_ be. I think this case is
> buggy. So we can check that we don't corrupt the heap, which is nice,
> but I don't like adding a test that doesn't test_cmp the expected output
> (and see my earlier comments re: thinking hard).
Three, I know the existence of the program is not more than "we
could do something like this" illustration by Linus, and its output
is in no way _designed_ to be so. We know today that it does not do
add/add conflict correctly thanks to this thread, but if we are
going to keep this program, we'd need to start from really designing
what its behaviour _should_ be, before casting the desirable
behaviour into stone with tests.
> But if we are going to keep it, maybe some exercise of the code is
> better than none.
So, "exercise" is better than none in the sense that it would
validate that "the command does something without barfing", but I
think there is a downside to casting its current behaviour as the
expected output in stone, if we are going to keep it.
next prev parent reply other threads:[~2016-02-16 21:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 21:39 malloc memory corruption on merge-tree with leading newline Stefan Frühwirth
2016-02-15 21:54 ` Stefan Frühwirth
2016-02-16 1:12 ` [PATCH] merge_blobs: use strbuf instead of manually-sized mmfile_t Jeff King
2016-02-16 5:09 ` Eric Sunshine
2016-02-16 5:50 ` Jeff King
2016-02-16 12:14 ` Stefan Frühwirth
2016-02-16 20:35 ` Jeff King
2016-02-19 12:43 ` Stefan Frühwirth
2016-02-16 21:27 ` Junio C Hamano [this message]
2016-02-19 12:48 ` Stefan Frühwirth
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=xmqqmvr0mjmc.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stefan.fruehwirth@uni-graz.at \
--cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.