From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff: Fix rename pretty-print when suffix and prefix overlap
Date: Thu, 28 Feb 2013 14:29:38 -0800 [thread overview]
Message-ID: <7vip5cgjhp.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1362088540-14564-1-git-send-email-apelisse@gmail.com> (Antoine Pelisse's message of "Thu, 28 Feb 2013 22:55:40 +0100")
Antoine Pelisse <apelisse@gmail.com> writes:
> When considering a rename for two files that have a suffix and a prefix
> that can overlap, a confusing line is shown. As an example, renaming
> "a/b/b/c" to "a/b/c" shows "a/b/{ => }/b/c", instead of "a/b/{b => }/c"
>
> Currently, what we do is calculate the common prefix ("a/b/"), and the
> common suffix ("/b/c"), but the same "/b/" is actually counted both in
> prefix and suffix. Then when calculating the size of the non-common part,
> we end-up with a negative value which is reset to 0, thus the "{ => }".
>
> Do not allow the common suffix to overlap the common prefix and stop
> when reaching a "/" that would be in both.
>
> Also add some test file to place corner-cases we could met (and this one)
> with rename pretty print.
>
> Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
> ---
Hmm, haven't we already applied this with a fix from Thomas Rast and
queued the result to 'next'?
next prev parent reply other threads:[~2013-02-28 22:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-23 16:48 [PATCH] diff: Fix rename pretty-print when suffix and prefix overlap Antoine Pelisse
2013-02-24 9:15 ` Junio C Hamano
2013-02-25 19:50 ` Antoine Pelisse
2013-02-25 22:36 ` Philip Oakley
2013-02-25 22:41 ` Antoine Pelisse
2013-02-28 21:55 ` Antoine Pelisse
2013-02-28 22:14 ` Thomas Rast
2013-02-28 22:22 ` Antoine Pelisse
2013-02-28 22:29 ` Junio C Hamano [this message]
2013-03-02 14:38 ` [PATCH] tests: make sure rename pretty print works Antoine Pelisse
2013-03-03 6:50 ` Junio C Hamano
2013-03-06 21:36 ` [PATCH v2] " Antoine Pelisse
2013-03-06 22:03 ` Junio C Hamano
2013-02-26 20:47 ` [PATCH] diff: prevent pprint_rename from underrunning input Thomas Rast
2013-02-26 21:44 ` Junio C Hamano
2013-02-27 13:27 ` Antoine Pelisse
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=7vip5cgjhp.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@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).