From: Tom Ritter <tom@ritter.vg>
To: git@vger.kernel.org
Subject: Can I convince the diff algorithm to behave better?
Date: Wed, 3 Mar 2021 02:03:59 +0000 [thread overview]
Message-ID: <CA+cU71=FfReSG411Feo=vmkw4MdK4KDgokP1jH6uwOkC_0AbYA@mail.gmail.com> (raw)
(For a specific, nuanced, and personal definition of better...)
I have a frequent behavior that arises when I am copy/pasting chunks
of code, typically in tests. Here is an example:
My Original code:
def function():
line 1
line 2
line 3
line 4
line 5
line 6
--------------------------------
I add, after it:
def function2():
line 1
line 2
line 3
line 4
line 5
line 6
--------------------------------
My diff is:
+ line 3
+ line 4
+ line 5
+ line 6
+
+def function2():
+ line 1
+ line 2
--------------------------------
I'd like my diff to be
+
+def function2():
+ line 1
+ line 2
+ line 3
+ line 4
+ line 5
+ line 6
Obviously there's nothing incorrect about the former diff, I just wish
it was the latter rather than the former.
I know that git includes four diff algorithms; in my testing patience
or histogram exacerbated the problem; and none of them improved upon
it. If anyone has suggestions I'd be curious to know if there's
anything that could be done...
Thanks,
-tom
next reply other threads:[~2021-03-03 14:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 2:03 Tom Ritter [this message]
2021-03-03 12:41 ` Can I convince the diff algorithm to behave better? Thomas Braun
2021-03-03 23:45 ` Jonathan Tan
2021-03-04 9:52 ` Christian Couder
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='CA+cU71=FfReSG411Feo=vmkw4MdK4KDgokP1jH6uwOkC_0AbYA@mail.gmail.com' \
--to=tom@ritter.vg \
--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).