From: Vincent Lefevre <vincent@vinc17.net>
Date: Fri, 08 May 2026 21:39:43 GMT
Subject: Re: [BUG] "git diff --word-diff" gives a diff while they are only space changes
Message-ID: <20260508213943.GP5260@qaa.vinc17.org>
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)