Hi,
On Sun, 3 Dec 2006, Jakub Narebski wrote:
> +--ignore-space-change::
> + Ignore changes in amount of white space. This ignores white
> + space at line end, and consider all other sequences of one or
> + more white space characters to be equivalent.
Thank you for bringing this up. The latter part is correct, but the first
part not yet. I asked at the time if somebody cares, but got no answer, so
"-b" does _not_ ignore white space at the end of line ATM, but only white
space change. So here is a patch to fix that behaviour:
-- snip --
diff -b: ignore whitespace at end of line
This is _not_ the same as "treat eol as whitespace", since that would mean
that multiple empty lines would be treated as equal to e.g. a space.
---
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 9e4bb47..1b899f3 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -230,7 +230,8 @@ unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
while (ptr + 1 < top && isspace(ptr[1])
&& ptr[1] != '\n')
ptr++;
- if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+ if (flags & XDF_IGNORE_WHITESPACE_CHANGE
+ && ptr[1] != '\n') {
ha += (ha << 5);
ha ^= (unsigned long) ' ';
}
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html