git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Bug report: AM 3-way patching fails with partial cloning

From
MSMarius Schiffer <marius@mschiffer.de>
Date
Jul 3, 2023, 16:46 UTC
Message-ID
<1e79047e-944c-0112-ffd0-ca52e31226c3@mschiffer.de>

When applying patches with git am on a repository cloned with filter=blob:none, the patching sometimes fails when it can't find the required SHA1 information. Applying the same thing on a normal clone works. I'm not sure yet what exactly i s missing that is not fetched, but I guess git should be able to fetch the missing blobs. I would also be very happy to hear workarounds, as I really love git partial cloning.

Using git v2.41.0.
To reproduce:
1. Download this patch: 
https://raw.githubusercontent.com/projectceladon/vendor-intel-utils/master/bsp_diff/common/kernel/linux-intel-lts2021/0007-9p-freezing-aborts-when-use-wait_event_killable.patch
2. Clone this repository: git clone --filter=blob:none 
https://github.com/projectceladon/linux-intel-lts2021
3. Apply the patch: git am -3 
../0007-9p-freezing-aborts-when-use-wait_event_killable.patch

-- Marius

Next: Junio C Hamano
Message 1 of 2 in “Bug report: AM 3-way patching fails with partial cloning”
  1. Marius SchifferJul 3, 2023
  2. Junio C HamanoJul 4, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.