diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 17:52:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 17:52:22 -0800 |
| commit | 8c4c286c394cc383577bf884f37a708bba98549e (patch) | |
| tree | 0cf968098bf4297baa233c7b409439ed0ff62c12 /xdiff | |
| parent | f26b5dc9efccc998510505685d6d919b4dd087e7 (diff) | |
| parent | 6d12acefd5ac0cd688bcc77470bb1d73859cdab1 (diff) | |
| download | git-8c4c286c394cc383577bf884f37a708bba98549e.tar.gz | |
Merge branch 'kc/maint-diff-bwi-fix' into maint
* kc/maint-diff-bwi-fix:
Fix combined use of whitespace ignore options to diff
test more combinations of ignore-whitespace options to diff
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xutils.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |