X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxutils.c;h=04ad468702209b77427e635370d41001986042ce;hb=1487eb68f7fd145151caa9a11ee00283629b75ef;hp=d7974d1a3e612a235b0c8adfde08ba802e782b5a;hpb=998b912927281a871e8d379e2b3a4385c775c4fe;p=git.git

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index d7974d1a3..04ad46870 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);