git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Matthew Booth <mbooth@redhat.com>, git@vger.kernel.org
Subject: Re: [PATCH] line-log: suppress diff output with "-s"
Date: Mon, 25 Feb 2019 18:59:18 +0100	[thread overview]
Message-ID: <20190225175918.GV1622@szeder.dev> (raw)
In-Reply-To: <20190225173248.GB17524@sigill.intra.peff.net>

On Mon, Feb 25, 2019 at 12:32:49PM -0500, Jeff King wrote:
> diff --git a/line-log.c b/line-log.c
> index 24e21731c4..863f5cbe0f 100644
> --- a/line-log.c
> +++ b/line-log.c
> @@ -1106,7 +1106,8 @@ int line_log_print(struct rev_info *rev, struct commit *commit)
>  	struct line_log_data *range = lookup_line_range(rev, commit);

Note that the result of this lookup_line_range() call is only used
when we do show the diff below; if we don't, there is no use calling
it.

>  	show_log(rev);
> -	dump_diff_hacky(rev, range);
> +	if (!(rev->diffopt.output_format & DIFF_FORMAT_NO_OUTPUT))
> +		dump_diff_hacky(rev, range);
>  	return 1;
>  }
>  

  reply	other threads:[~2019-02-25 17:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-25 17:03 [BUG] git log -L ... -s does not suppress diff output Matthew Booth
2019-02-25 17:18 ` Jeff King
2019-02-25 17:32   ` [PATCH] line-log: suppress diff output with "-s" Jeff King
2019-02-25 17:59     ` SZEDER Gábor [this message]
2019-02-25 18:55       ` Jeff King
2019-02-25 18:46   ` [BUG] git log -L ... -s does not suppress diff output Randall S. Becker

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=20190225175918.GV1622@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=mbooth@redhat.com \
    --cc=peff@peff.net \
    /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).