[PATCH 0/2] Fix xdiff's --ignore-space-at-eol handling
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 9, 2016, 07:23 UTC
- Message-ID
- <cover.1468048754.git.johannes.schindelin@gmx.de>
It turns out that I am not the only Git developer capable of producing an off-by-one bug ;-)
This patch series fixes a bug where we ignored single-character changes at the end of the lines when trying to ignore white space at the end of the lines.
I split the changes into two patches because the fix turned out to have a much broader scope than the test (which demonstrates just a symptom): the bug was not in the patience-specific part of the diff code, after all.
Johannes Schindelin (2): diff: demonstrate a bug with --patience and --ignore-space-at-eol diff: fix a double off-by-one with --ignore-space-at-eol
t/t4033-diff-patience.sh | 8 ++++++++ xdiff/xpatience.c | 2 +- xdiff/xutils.c | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-)
Published-As: https://github.com/dscho/git/releases/tag/patience-v1
-- 2.9.0.278.g1caae67 base-commit: 5c589a73de4394ad125a4effac227b3aec856fa1