From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix
Date: Thu, 11 Aug 2016 13:55:27 -0700 [thread overview]
Message-ID: <xmqqinv7yqio.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160810231908.26330-1-jacob.e.keller@intel.com> (Jacob Keller's message of "Wed, 10 Aug 2016 16:19:07 -0700")
Subject: SQUASH??? clarify the if/{if/else} nesting
Otherwise GCC helpfully warns you.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index bfc0a6b..d128b9d 100644
--- a/diff.c
+++ b/diff.c
@@ -1170,11 +1170,12 @@ const char *diff_line_prefix(struct diff_options *opt)
{
struct strbuf *msgbuf;
- if (!opt->output_prefix)
+ if (!opt->output_prefix) {
if (opt->line_prefix)
return opt->line_prefix;
else
return "";
+ }
msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
/* line prefix must be printed before the output_prefix() */
--
2.9.2-863-g71ed253
prev parent reply other threads:[~2016-08-11 20:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 23:19 [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix Jacob Keller
2016-08-10 23:19 ` [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff Jacob Keller
2016-08-11 17:53 ` Junio C Hamano
2016-08-11 18:34 ` Jacob Keller
2016-08-11 20:50 ` Junio C Hamano
2016-08-11 17:22 ` [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix Junio C Hamano
2016-08-11 18:30 ` Jacob Keller
2016-08-11 20:55 ` Junio C Hamano [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=xmqqinv7yqio.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.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.