From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:17 +0000 (-0800)
Subject: Merge branch 'vn/xdiff-func-context'
X-Git-Tag: v2.13.0-rc0~157
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9720b302479639253518d39ec758241d91275ee6?hp=39b8980bb9eacfff0f28101e71354350fdfc5340

Merge branch 'vn/xdiff-func-context'

"git diff -W" has been taught to handle the case where a new
function is added at the end of the file better.

* vn/xdiff-func-context:
xdiff -W: relax end-of-file function detection
---

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 7389ce4102..8c88dbde38 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -183,16 +183,14 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 
 				/*
 				 * We don't need additional context if
-				 * a whole function was added, possibly
-				 * starting with empty lines.
+				 * a whole function was added.
 				 */
-				while (i2 < xe->xdf2.nrec &&
-				       is_empty_rec(&xe->xdf2, i2))
+				while (i2 < xe->xdf2.nrec) {
+					if (match_func_rec(&xe->xdf2, xecfg, i2,
+						dummy, sizeof(dummy)) >= 0)
+						goto post_context_calculation;
 					i2++;
-				if (i2 < xe->xdf2.nrec &&
-				    match_func_rec(&xe->xdf2, xecfg, i2,
-						   dummy, sizeof(dummy)) >= 0)
-					goto post_context_calculation;
+				}
 
 				/*
 				 * Otherwise get more context from the