From: Jeff King <peff@peff.net>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>,
git@vger.kernel.org
Subject: [BUG-ish] diff compaction heuristic false positive
Date: Fri, 10 Jun 2016 03:50:43 -0400 [thread overview]
Message-ID: <20160610075043.GA13411@sigill.intra.peff.net> (raw)
I found a false positive with the new compaction heuristic in v2.9:
-- >8 --
# start with a simple file
cat >file.rb <<\EOF
def foo
do_foo_stuff()
common_ending()
end
EOF
git add file.rb
git commit -m base
# and then add another function with a similar ending
cat >>file.rb <<\EOF
def bar
do_bar_stuff()
common_ending()
end
EOF
-- 8< --
I get this rather unfortunate diff:
$ git diff
diff --git a/file.rb b/file.rb
index bd9d1cb..67fbeba 100644
--- a/file.rb
+++ b/file.rb
@@ -1,5 +1,11 @@
def foo
do_foo_stuff()
+ common_ending()
+end
+
+def bar
+ do_bar_stuff()
+
common_ending()
end
but without the compaction heuristic (or with an older git), I get:
$ git -c diff.compactionHeuristic=false diff
diff --git a/file.rb b/file.rb
index bd9d1cb..67fbeba 100644
--- a/file.rb
+++ b/file.rb
@@ -3,3 +3,9 @@ def foo
common_ending()
end
+
+def bar
+ do_bar_stuff()
+
+ common_ending()
+end
:( The problem is that the common bits are separated from the
interesting bits by a blank line. This is simplified from a real-world
example, but I think you could come up with the same example in C, like:
if (foo) {
do_foo();
something_else();
}
-Peff
next reply other threads:[~2016-06-10 7:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 7:50 Jeff King [this message]
2016-06-10 8:31 ` [BUG-ish] diff compaction heuristic false positive Jeff King
2016-06-10 15:56 ` Junio C Hamano
2016-06-10 16:25 ` Stefan Beller
2016-06-10 16:29 ` Jacob Keller
2016-06-10 18:13 ` Re* " Junio C Hamano
2016-06-10 18:21 ` Stefan Beller
2016-06-10 20:30 ` Jeff King
2016-06-10 20:48 ` [PATCH v2] diff: disable compaction heuristic for now Junio C Hamano
2016-06-10 20:53 ` Jeff King
2016-06-10 20:55 ` Junio C Hamano
2016-06-10 21:05 ` Jeff King
2016-06-10 21:46 ` Junio C Hamano
2016-06-10 8:31 ` [BUG-ish] diff compaction heuristic false positive Michael Haggerty
2016-06-10 8:41 ` Jeff King
2016-06-10 11:00 ` Michael Haggerty
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=20160610075043.GA13411@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.com \
/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).