Git development
 help / color / mirror / Atom feed
From: Vincent Lefevre <vincent@vinc17.net>
To: Johannes Sixt <j6t@kdbg.org>
Cc: git@vger.kernel.org
Subject: Re: [BUG] "git diff --word-diff" gives a diff while they are only space changes
Date: Fri, 8 May 2026 23:39:43 +0200	[thread overview]
Message-ID: <20260508213943.GP5260@qaa.vinc17.org> (raw)
In-Reply-To: <7cedf86c-5db7-45ef-b8d4-034b792f0def@kdbg.org>

On 2026-05-08 14:48:01 +0200, Johannes Sixt wrote:
> This is expected behavior.
> 
> git diff --word-diff is not agnostic to whitespace; if you drop
> --word-diff, you see the line-diff that the word-diff is based on. If
> you want whitespace-agnostic word-diff, you have to add -w.

This is not how it is documented. Even when using "git diff" without
--word-diff, but with GNU wdiff instead, the output is fine:

$ git diff file1 file2 | wdiff -d
diff --git a/file1 b/file2
index da04344..0074613 100644
[--- a/file1-]
{+++ b/file2+}
@@ -1,5 +1,5 @@
1
 2
 3
 2
 4

-- 
Vincent Lefèvre <vincent@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / Pascaline project (LIP, ENS-Lyon)

  reply	other threads:[~2026-05-08 21:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-06  1:09 [BUG] "git diff --word-diff" gives a diff while they are only space changes Vincent Lefevre
2026-05-08 12:48 ` Johannes Sixt
2026-05-08 21:39   ` Vincent Lefevre [this message]
2026-05-09  6:16     ` Johannes Sixt
2026-05-09 15:55       ` Vincent Lefevre
  -- strict thread matches above, loose matches on Subject: below --
2026-05-12 20:56 Michael Montalbo
2026-05-12 21:17 ` Vincent Lefevre
2026-05-13 15:52   ` Michael Montalbo
2026-05-14  7:37 ` Junio C Hamano
2026-05-14  9:55   ` Vincent Lefevre
2026-05-15 13:22     ` Phillip Wood

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260508213943.GP5260@qaa.vinc17.org \
    --to=vincent@vinc17.net \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox