From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Yasushi SHOJI <yashi@atmark-techno.com>, git@vger.kernel.org
Subject: Re: diff: --quiet does not imply --exit-code if --diff-filter is present
Date: Tue, 31 May 2011 12:25:46 -0400 [thread overview]
Message-ID: <20110531162546.GA11321@sigill.intra.peff.net> (raw)
In-Reply-To: <7vvcwqkh4a.fsf@alter.siamese.dyndns.org>
On Tue, May 31, 2011 at 08:46:29AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > Commit 2cfe8a6 (diff --quiet: disable optimization when
> > --diff-filter=X is used, 2011-03-16) fixes this in some
> > cases by disabling the optimization when a filter is
> > present. However, it only tweaked run_diff_files, missing
> > the similar case in diff_tree. Thus the fix worked only for
> > diffing the working tree and index, but not between trees.
>
> Thanks; a natural question is if we need the same for diff-index, then.
No, it calls straight into unpack_trees. So I think the question is
"should unpack_trees respect the QUICK optimization". I suspect it
didn't happen simply because unpack_trees is so complex, and there are
probably corner cases with merging.
> We probably want to have a helper in diff.c that does
>
> int diff_can_quit_early(struct diff_options *opt)
> {
> return (DIFF_OPT_TST(opt, QUICK) &&
> !opt->filter &&
> DIFF_OPT_TST(opt, HAS_CHANGES));
> }
>
> It is possible for us to later add new diffcore transformations that need
> a similar "do not stop feeding early, as results may be filtered".
Yeah, that is a good refactoring. It's more readable, and it would have
prevented this bug. :)
-Peff
next prev parent reply other threads:[~2011-05-31 16:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-31 10:34 diff: --quiet does not imply --exit-code if --diff-filter is present Yasushi SHOJI
2011-05-31 15:33 ` Jeff King
2011-05-31 15:46 ` Junio C Hamano
2011-05-31 16:25 ` Jeff King [this message]
2011-05-31 17:06 ` Re* " Junio C Hamano
2011-05-31 17:14 ` Jeff King
2011-05-31 17:36 ` Junio C Hamano
2011-06-01 9:41 ` Yasushi SHOJI
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=20110531162546.GA11321@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=yashi@atmark-techno.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).