git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Count of San Francisco <countofsanfrancisco@gmail.com>
To: git@vger.kernel.org
Subject: git diff word diff bug??
Date: Tue, 20 Apr 2021 09:38:57 -0700	[thread overview]
Message-ID: <215a2703-7a16-5ebd-41b5-de0830a1cf63@gmail.com> (raw)

Hi All,

Here is my "git bugreport":

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)
   git diff --word-diff=porcelain file0.txt file1.txt
     or
   git diff --word-diff file0.txt file1.txt

What did you expect to happen? (Expected behavior)

   I expected the diff for porcelain or default word-diff to be clear on 
which lines got removed and which changes belong to which line. I 
explain more in details below.

What happened instead? (Actual behavior)

   The diff was not clear.

What's different between what you expected and what actually happened?

   The diff made it looked like all the removed text were on one line 
and a later change in a line look like it was meant for a different 
line. When in fact, the later changes were for the same line (i.e. the 
first line). More details below.

Anything else you want to add:

Here are the details to reproduce and more details on how I interpreted 
the diff. If I am writing a script to highlight changes or to do extra 
processing for my specific use case, my script would get confused as to 
what really changed.

file0.txt content:
*** Begin Content *** --> this line is not in the actual file but just a 
marker here for clarity.
The fox jumped over the wall.
Blah1e32
q432423
qe23234
  233
253
345235

53243
afsfffas
*** End Content ****

file1.txt content:
*** Begin Content ***
The fox jumped over the river.
   He made it over.
*** End Content ****

git diff --word-diff file0.txt file1.txt produced this:
diff --git a/file0.txt b/file1.txt
index c8756ba..3413f10 100644
--- a/file0.txt
+++ b/file1.txt
@@ -1,11 +1,2 @@
The fox jumped over the [-wall.-]
[-Blah1e32-]
[-q432423-]
[-qe23234-]
[- 233-]
[-253-]
[-345235-]

[-53243-]
[-afsfffas-]{+river.+}
{+  He made it over.+}

The diff above does not make it clear that the "{+river+}" is really to 
be appended (or related) to the first line.
I expected the first diff line to look like this:
The fox jumped over the [-wall.-]{+river+} and the rest of the lines are 
delete lines.

git diff --word-diff=porcelain file0.txt file1.txt produced this:
diff --git a/file0.txt b/file1.txt
index c8756ba..3413f10 100644
--- a/file0.txt
+++ b/file1.txt
@@ -1,11 +1,2 @@
  The fox jumped over the
-wall.
~
-Blah1e32
~
-q432423
~
-qe23234
~
- 233
~
-253
~
-345235
~
~
-53243
~
-afsfffas
+river.
~
+  He made it over.
~

This is more non-discernable. The git diff --help documentation says 
that "Newlines in the input are represented by a tilde ~ on a line of 
its own". So a script would see the '~' character and interpret that as 
a new line. The script would have mistaken the "+river" for a different 
line. The git diff --help documentation does not explain what to do in 
this scenario.

I expected this:
  The fox jumped over the
-wall.
+river.
~

Is this a bug? If not, how do I make the distinction that the {+river+} 
(in the first case) and the +river (in the 2nd case) is really for the 
first line?

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.30.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Darwin 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:07:06 
PST 2021; root:xnu-7195.81.3~1/RELEASE_X86_64 x86_64
compiler info: clang: 12.0.0 (clang-1200.0.32.28)
libc info: no libc information available
$SHELL (typically, interactive shell): /usr/local/bin/bash


[Enabled Hooks]
not run from a git repository - no hooks to show


             reply	other threads:[~2021-04-20 16:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-20 16:38 Count of San Francisco [this message]
2021-04-25  8:54 ` Atharva Raykar
2021-04-26  9:45   ` Ævar Arnfjörð Bjarmason
2021-04-30  4:12     ` Count of San Francisco
2021-05-02 18:00     ` Phillip Wood
2021-05-03  9:47       ` Phillip Wood
2022-06-07 22:40         ` Scott Phuong

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=215a2703-7a16-5ebd-41b5-de0830a1cf63@gmail.com \
    --to=countofsanfrancisco@gmail.com \
    --cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).