From: Nikolay Borisov <nik.borisov@suse.com>
To: tools@kernel.org
Subject: b4 diff failure scenario
Date: Fri, 26 Jan 2024 10:51:52 +0200 [thread overview]
Message-ID: <b93b0a56-0207-4538-9413-36d59c20ca2e@suse.com> (raw)
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
next reply other threads:[~2024-01-26 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-26 8:51 Nikolay Borisov [this message]
2024-01-26 16:32 ` b4 diff failure scenario Konstantin Ryabitsev
2024-01-26 16:35 ` Kernel.org Bugbot
2024-02-13 16:35 ` Kernel.org Bugbot
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=b93b0a56-0207-4538-9413-36d59c20ca2e@suse.com \
--to=nik.borisov@suse.com \
--cc=tools@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).