From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Naja Melan <najamelan@autistici.org>
Subject: [PATCH 0/2] Fix xdiff's --ignore-space-at-eol handling
Date: Sat, 9 Jul 2016 09:23:43 +0200 (CEST) [thread overview]
Message-ID: <cover.1468048754.git.johannes.schindelin@gmx.de> (raw)
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
next reply other threads:[~2016-07-09 7:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-09 7:23 Johannes Schindelin [this message]
2016-07-09 7:23 ` [PATCH 1/2] diff: demonstrate a bug with --patience and --ignore-space-at-eol Johannes Schindelin
2016-07-09 7:23 ` [PATCH 2/2] diff: fix a double off-by-one with --ignore-space-at-eol Johannes Schindelin
2016-07-09 7:28 ` Naja Melan
2016-07-11 19:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1468048754.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=najamelan@autistici.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).