b4 diff failure scenario

b4 diff failure scenario

[Nikolay Borisov]

Hello,


I get the following, seemingly unexpected failure:

$ b4 -d diff -m v5_20231223_kirill_shutemov_x86_tdx_add_kexec_support.mbx v6_20240124_kirill_shutemov_x86_tdx_add_kexec_support.mbx

Running git --no-pager rev-parse --show-toplevel
Running git --no-pager config -z --get-regexp b4\..*
Running git --no-pager config -z --get-regexp gpg\..*
Cache miss for 20231222235209.32143-2-kirill.shutemov@linux.intel.com
Preparing fake-am for v5: x86/acpi: Extract ACPI MADT wakeup code into a separate file
Running git --no-pager worktree add --detach --no-checkout /tmp/tmptvjh0w46
Looking at [PATCH v5 1/16] x86/acpi: Extract ACPI MADT wakeup code into a separate file
Running git --no-pager rev-parse f896eed4516c
   Found matching blob for: arch/x86/include/asm/acpi.h
Running git --no-pager update-index --add --cacheinfo 0644,f896eed4516c7e3c131751ab5865aa70cfa2d645,arch/x86/include/asm/acpi.h
Running git --no-pager rev-parse 536586d5ef00
   ERROR: Could not find matching blob for arch/x86/Kconfig (536586d5ef00)
          If you know on which tree this patchset is based,
          add it as a remote and perform "git remote update"
          in order to fetch the missing objects.
Running git --no-pager worktree remove --force /tmp/tmptvjh0w46



The 2 mbx files are a result of running:

b4 am 20231222235209.32143-1-kirill.shutemov@linux.intel.com
b4 am 20240124125557.493675-1-kirill.shutemov@linux.intel.com


The currently checkedout branch is at commit 83e1bdc94f32dcf52dfcd2025acc7a2b9376b1e8 and both .mbx
can be applied cleanly on top. Of course, manually applying them and running git range-diff
is a viable workaround but it would have been best if this "had just worked".

Regards,
Nikolay

Re: b4 diff failure scenario

[Konstantin Ryabitsev]

On Fri, Jan 26, 2024 at 10:51:52AM +0200, Nikolay Borisov wrote:
> The currently checkedout branch is at commit 83e1bdc94f32dcf52dfcd2025acc7a2b9376b1e8 and both .mbx
> can be applied cleanly on top. Of course, manually applying them and running git range-diff
> is a viable workaround but it would have been best if this "had just worked".

Yes, we should try a bit harder before failing.

bugbot assign to me

-K

Re: b4 diff failure scenario

[Kernel.org Bugbot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=218425

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 diff failure scenario

[Kernel.org Bugbot]

Konstantin Ryabitsev writes in commit bc83b76296315abd62fdfcec2276d96e3b611f7a:

diff: make the algorithm more forgiving

Be more forgiving when preparing fake-am ranges, so that series that
apply cleanly without a perfect hash object matches are still possible
to diff.

Reported-by: Nikolay Borisov <nik.borisov@suse.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218425
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

(via https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=bc83b7629631)
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)