diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 17:07:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 17:07:51 -0800 |
| commit | 9a01387b9714452ebcae431705a288e1a7e099c3 (patch) | |
| tree | cd740cca16bcf94af4221fc43111e872e6ae3622 /xdiff | |
| parent | 36dd9393938d4e7f8843c6c587c9b4db077377fc (diff) | |
| parent | 6d12acefd5ac0cd688bcc77470bb1d73859cdab1 (diff) | |
| download | git-9a01387b9714452ebcae431705a288e1a7e099c3.tar.gz | |
Merge branch 'kc/maint-diff-bwi-fix'
* kc/maint-diff-bwi-fix:
Fix combined use of whitespace ignore 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); |