From: Eli Barzilay <eli@barzilay.org>
To: "René Scharfe" <l.s.r@web.de>
Cc: git <git@vger.kernel.org>
Subject: Re: git-diff bug?
Date: Mon, 2 Nov 2020 16:06:49 -0500 [thread overview]
Message-ID: <CALO-gusRt4J5ar45mo7un-EENyt5cX2SQvcXgyMmaHNZg5bFUg@mail.gmail.com> (raw)
In-Reply-To: <72cfef26-e986-d34c-eea4-46ec0fda2688@web.de>
On Mon, Nov 2, 2020 at 12:45 PM René Scharfe <l.s.r@web.de> wrote:
>
> $ printf "aaa\nbbb\nccc\n\n" > 1
> $ printf "aaa\nbbb\n\nccc\n" > 2
>
> $ diff --ignore-blank-lines -u 1 2
> --- 1 2020-11-02 18:11:04.618133008 +0100
> +++ 2 2020-11-02 18:11:04.618133008 +0100
> @@ -1,4 +1,4 @@
> aaa
> bbb
> -ccc
>
> +ccc
> $ diff --ignore-blank-lines -u 2 1
Yes, this is what I'm getting, also without a -u. (Also on 2.29.2)
> This matches your results. That the order makes a difference is a bit
> odd. Both are valid diffs of the inputs and neither one changes blank
> lines, though, so it doesn't look like a bug.
How is it valid? Isn't the whole point of `--ignore-blank-lines` to
do the same thing as comparing a version of the files that drops all
empty lines?
>
> $ git diff --ignore-blank-lines 1 2
> $ git diff --ignore-blank-lines 2 1
> $ git --version
> git version 2.29.2
>
> This matches your expectation, but not your results. Which version do
> you use?
$ git diff --ignore-blank-lines 1 2
diff --git a/1 b/2
index fc13a35..bd05737 100644
--- a/1
+++ b/2
@@ -1,4 +1,4 @@
aaa
bbb
-ccc
+ccc
$ git --version
git version 2.29.2
--
((x=>x(x))(x=>x(x))) Eli Barzilay:
http://barzilay.org/ Maze is Life!
next prev parent reply other threads:[~2020-11-02 21:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 6:53 git-diff bug? Eli Barzilay
2020-11-02 17:45 ` René Scharfe
2020-11-02 21:06 ` Eli Barzilay [this message]
2020-11-02 22:14 ` Junio C Hamano
2020-11-03 3:14 ` Eli Barzilay
2020-11-03 16:58 ` Junio C Hamano
2020-11-02 22:00 ` Junio C Hamano
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=CALO-gusRt4J5ar45mo7un-EENyt5cX2SQvcXgyMmaHNZg5bFUg@mail.gmail.com \
--to=eli@barzilay.org \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/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).