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 1/2] diff: demonstrate a bug with --patience and --ignore-space-at-eol
Date: Sat, 9 Jul 2016 09:23:50 +0200 (CEST) [thread overview]
Message-ID: <db5aa5d1f22a22901eb3dd57132e027f462852c5.1468048754.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1468048754.git.johannes.schindelin@gmx.de>
When a single character is added to a line, the combination of these
two options results in an empty diff.
This bug was noticed and reported by Naja Melan.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t4033-diff-patience.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
index 3c9932e..5f0d0b1 100755
--- a/t/t4033-diff-patience.sh
+++ b/t/t4033-diff-patience.sh
@@ -5,6 +5,14 @@ test_description='patience diff algorithm'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-alternative.sh
+test_expect_failure '--ignore-space-at-eol with a single appended character' '
+ printf "a\nb\nc\n" >pre &&
+ printf "a\nbX\nc\n" >post &&
+ test_must_fail git diff --no-index \
+ --patience --ignore-space-at-eol pre post >diff &&
+ grep "^+.*X" diff
+'
+
test_diff_frobnitz "patience"
test_diff_unique "patience"
--
2.9.0.278.g1caae67
next prev parent 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 [PATCH 0/2] Fix xdiff's --ignore-space-at-eol handling Johannes Schindelin
2016-07-09 7:23 ` Johannes Schindelin [this message]
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=db5aa5d1f22a22901eb3dd57132e027f462852c5.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).