git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[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
Next: Johannes Schindelin
Message 1 of 5 in “Fix xdiff's --ignore-space-at-eol handling”
  1. 0/2 Fix xdiff's --ignore-space-at-eol handlingJohannes Schindelin, Jul 9, 2016
  2. 1/2 diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin, Jul 9, 2016
  3. 2/2 diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin, Jul 9, 2016
  4. Naja MelanJul 9, 2016
  5. Junio C HamanoJul 11, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.