Re: [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix

From

Junio C Hamano <gitster@pobox.com>

Date

Aug 11, 2016, 20:55 UTC

Message-ID

<xmqqinv7yqio.fsf@gitster.mtv.corp.google.com>

In-Reply-To

<20160810231908.26330-1-jacob.e.keller@intel.com>

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