Re: [PATCH] xdiff: Do not consider lines starting by # hunkworthy
From: Junio C Hamano <hidden>
Date: 2016-08-11 19:28:40
Possibly related (same subject, not in this thread)
- 2016-08-11 · Re: [PATCH] xdiff: Do not consider lines starting by # hunkworthy · Jakub Narebski <hidden>
- 2016-08-11 · [PATCH] xdiff: Do not consider lines starting by # hunkworthy · Petr Baudis <hidden>
Petr Baudis [off-list ref] writes:
quoted hunk
This will be probably controversial but in my personal experience, the amount of time this is the right thing to do because of #defines is negligible compared to amount of time it is wrong, especially because of #ifs and #endifs in the middle of functions and also because of comments at the line start when it concerns non-C files. Signed-off-by: Petr Baudis <redacted> --- xdiff/xemit.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 714c563..4f20075 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c@@ -86,8 +86,7 @@ static void xdl_find_func(xdfile_t *xf, if (len > 0 && (isalpha((unsigned char)*rec) || /* identifier? */ *rec == '_' || /* also identifier? */ - *rec == '(' || /* lisp defun? */ - *rec == '#')) { /* #define? */ + *rec == '(')) { /* #define? */ if (len > sz) len = sz; if (len && rec[len - 1] == '\n')
I'd either omit the opening parenthesis or fix the comment ;-). More seriously, I'd rather just match default GNU diff behaviour to use isalpha, underscore or '$'. I do not particularly like to have '$' but I feel it is the easiest to match a prior art in cases like this because I do not have to defend my position when somebody says "Why do you include '#'??? It makes no sense!". Since I do not care too much about it, being able to just say "Well we match what GNU diff does by default." is a good thing.