From 6d12acefd5ac0cd688bcc77470bb1d73859cdab1 Mon Sep 17 00:00:00 2001 From: Keith Cascio Date: Mon, 19 Jan 2009 10:03:04 -0800 Subject: Fix combined use of whitespace ignore options to diff The code used to misbehave when options to ignore certain whitespaces (-w -b and --ignore-at-eol) were combined. Signed-off-by: Keith Cascio Signed-off-by: Junio C Hamano --- xdiff/xutils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xdiff') diff --git a/xdiff/xutils.c b/xdiff/xutils.c index d7974d1a3e..04ad468702 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -245,12 +245,14 @@ static unsigned long xdl_hash_record_with_whitespace(char const **data, while (ptr + 1 < top && isspace(ptr[1]) && ptr[1] != '\n') ptr++; - if (flags & XDF_IGNORE_WHITESPACE_CHANGE + if (flags & XDF_IGNORE_WHITESPACE) + ; /* already handled */ + else if (flags & XDF_IGNORE_WHITESPACE_CHANGE && ptr[1] != '\n') { ha += (ha << 5); ha ^= (unsigned long) ' '; } - if (flags & XDF_IGNORE_WHITESPACE_AT_EOL + else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL && ptr[1] != '\n') { while (ptr2 != ptr + 1) { ha += (ha << 5); -- cgit v1.2.3