From: Johannes Sixt <j6t@kdbg•org>
To: Vincent Lefevre <vincent@vinc17•net>
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 14:48:01 +0200 [thread overview]
Message-ID: <7cedf86c-5db7-45ef-b8d4-034b792f0def@kdbg.org> (raw)
In-Reply-To: <20260506010927.GE5260@qaa.vinc17.org>
Am 06.05.26 um 03:09 schrieb Vincent Lefevre:
> Consider the following two 5-line files:
>
> file1:
>
> 1
> 2
> 3
> 2
> 4
>
> file2:
>
> 1
> 2
> 3
> 2
> 4
>
> On these files, "git diff --word-diff file1 file2" gives
>
> --- a/file1
> +++ b/file2
> @@ -1,5 +1,5 @@
> 1
> [-2-]
> [-3-]
> 2
> {+3+}
> {+ 2+}
> 4
>
> instead of
>
> --- a/file1
> +++ b/file2
> @@ -1,5 +1,5 @@
> 1
> 2
> 3
> 2
> 4
>
> (e.g. as output by GNU wdiff 1.2.2).
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.
-- Hannes
next prev parent reply other threads:[~2026-05-08 12:48 UTC|newest]
Thread overview: 18+ 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 [this message]
2026-05-08 21:39 ` Vincent Lefevre
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
2026-05-18 3:30 ` Michael Montalbo
2026-05-18 7:30 ` Johannes Sixt
2026-05-19 2:07 ` Michael Montalbo
2026-05-19 2:31 ` Chris Torek
2026-05-19 3:11 ` Junio C Hamano
2026-05-20 20:21 ` Michael Montalbo
2026-05-28 19:25 ` Michael Montalbo
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=7cedf86c-5db7-45ef-b8d4-034b792f0def@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=vincent@vinc17$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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