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

Re: [PATCH 7/6 (v4)] support for commit grafts, slight change to general mechanism

From
Chris Johnsen <chris_johnsen@pobox.com>
Date
Sep 30, 2009, 08:00 UTC
Message-ID
<A32FCFC6-13E2-4A9D-88FB-01ED47FE88AA@pobox.com>
In-Reply-To
<20090929163414.GA25756@spearce.org>
On 2009 Sep 29, at 11:34, Shawn O. Pearce wrote:
Show 7 quoted lines
> Nick Edelen <sirnot@gmail.com> wrote:
>> diff --git a/builtin-rev-cache.c b/builtin-rev-cache.c
>> index 4c1766d..b36bc39 100644
>
> This doesn't apply against ne/rev-cache^, and I don't have the
> blobs in my repostiory.  So I'm dropping this patch and will wait
> for a resend of the series or something...

It appears that the patch suffers from "format=flowed" whitespace mangling. This caused the context lines to have an extra leading space character.

After running a ham-fisted "sed -e 's/^ / /'" over the patch, 'git am' was able to apply it to ne/rev-cache^ (d05c9be9fa) even though one of the referenced blobs (6c96297; rev-cache.c) was missing.

-- 
Chris
Previous: Shawn O. PearceNext: Nick Edelen
Message 4 of 8 in “support for commit grafts, slight change to general mechanism”
  1. 7/6 support for commit grafts, slight change to general mechanismNick Edelen, Sep 7, 2009
  2. Nick EdelenSep 27, 2009
  3. Shawn O. PearceSep 29, 2009
  4. Chris JohnsenSep 30, 2009
  5. Nick EdelenOct 19, 2009
  6. Thomas RastOct 21, 2009
  7. Thomas RastOct 21, 2009
  8. Nick EdelenOct 27, 2009

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.