From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: tools@linux.kernel.org
Subject: Re: [PATCH b4] Fix 'LoreSeries::make_fake_am_range' with renamed, then modified file
Date: Tue, 29 Nov 2022 13:42:15 -0500 [thread overview]
Message-ID: <166974733534.181387.13494072343779576172.b4-ty@linuxfoundation.org> (raw)
In-Reply-To: <20221107134054.75514-1-levraiphilippeblain@gmail.com>
On Mon, 07 Nov 2022 08:40:54 -0500, Philippe Blain wrote:
> When invoking 'b4 diff', LoreSeries::make_fake_am_range is used to
> create the old and new versions of a series in a temporary worktree.
>
> The code is currently unprepared for a series that renames a file
> and then modifies it in a subsequent commit.
>
> The first issue is that LoreMessage::get_indexes fails to set
> blob_indexes for a renamed file since the 'diff --git' header for such a
> change has different file names for the "old" and "new" file, but that
> function skips any diff where "old" and "new" do not match. Fix that by
> removing that condition.
>
> [...]
Applied, thanks!
[1/1] Fix 'LoreSeries::make_fake_am_range' with renamed, then modified file
commit: 10cabf05b0404f7a87522180750d003985211814
Best regards,
--
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
prev parent reply other threads:[~2022-11-29 18:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 13:01 b4 can't diff a series with a file renamed, then modified Philippe Blain
2022-10-26 18:11 ` [RFC PATCH] Fix 'LoreSeries::make_fake_am_range' with renamed, then modified file Philippe Blain
2022-10-31 19:51 ` Konstantin Ryabitsev
2022-11-07 13:40 ` [PATCH b4] " Philippe Blain
2022-11-28 18:07 ` Philippe Blain
2022-11-29 18:42 ` Konstantin Ryabitsev [this message]
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=166974733534.181387.13494072343779576172.b4-ty@linuxfoundation.org \
--to=konstantin@linuxfoundation.org \
--cc=levraiphilippeblain@gmail.com \
--cc=tools@linux.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 read-only IMAP folder(s) and NNTP newsgroup(s).