undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vn/xdiff-func-context'

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2017-02-27 13:57:17 -08:00
commit 9720b30247
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xdiff/xemit.c
View File

@ -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