git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ulrich Windl" <Ulrich.Windl@rz.uni-regensburg.de>
To: <git@vger.kernel.org>
Subject: Help understanding unexpected diff output
Date: Mon, 13 Jul 2020 12:34:35 +0200	[thread overview]
Message-ID: <5F0C38BB020000A100039FF0@gwsmtp.uni-regensburg.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Hi!

I hope we all agree that diff should make our lives easier, so here is something where I think it does not apply:

I inspected some changes using "git diff", and it was hard to me to find the actual differences (see git-diff-png):
I had to look a long time at those olcAccess lines to find any difference, so finally I pasted both blocks into separate Emacs files a and b  (via PuTTY) and used "ediff-files" (see diff-emacs.png).
Within there, the was only a part of one line changed!

I don't understand this. I had even used "git diff -w" to ignore space changes (which aren't expected anyway).

Any ideas what might be wrong and how to get better diff output?

(git-2.26.2-27.36.1.x86_64 of SLES12 being used)

Regards,
Ulrich






[-- Attachment #2: diff-git.PNG --]
[-- Type: image/png, Size: 70291 bytes --]

[-- Attachment #3: diff-emacs.PNG --]
[-- Type: image/png, Size: 27142 bytes --]

             reply	other threads:[~2020-07-13 10:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-13 10:34 Ulrich Windl [this message]
2020-07-13 15:12 ` Help understanding unexpected diff output Junio C Hamano
2020-07-14  8:52   ` Antw: [EXT] " Ulrich Windl
2020-07-14 18:53     ` Junio C Hamano
2020-10-23 14:24     ` Philip Oakley

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=5F0C38BB020000A100039FF0@gwsmtp.uni-regensburg.de \
    --to=ulrich.windl@rz.uni-regensburg.de \
    --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. 
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 NNTP newsgroup(s).