[PATCH 1/2] diff: demonstrate a bug with --patience and --ignore-space-at-eol
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 9, 2016, 07:23 UTC
- Message-ID
- <db5aa5d1f22a22901eb3dd57132e027f462852c5.1468048754.git.johannes.schindelin@gmx.de>
- 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