git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
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 08:46:29 -0700	[thread overview]
Message-ID: <7vvcwqkh4a.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110531153356.GB2594@sigill.intra.peff.net> (Jeff King's message of "Tue, 31 May 2011 11:33:56 -0400")

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.

> diff --git a/tree-diff.c b/tree-diff.c
> index 7a79660..3d08f78 100644
> --- a/tree-diff.c
> +++ b/tree-diff.c
> @@ -143,6 +143,7 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
>  
>  	for (;;) {
>  		if (DIFF_OPT_TST(opt, QUICK) &&
> +		    !opt->filter &&
>  		    DIFF_OPT_TST(opt, HAS_CHANGES))
>  			break;
>  		if (opt->pathspec.nr) {

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".

  reply	other threads:[~2011-05-31 15:46 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 [this message]
2011-05-31 16:25     ` Jeff King
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=7vvcwqkh4a.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --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).