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

Re: BUG?: git-apply sometimes says "corrupt patch" when adding single lines

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 18, 2010, 07:29 UTC
Message-ID
<4C6B8BC8.9050301@viscovery.net>
In-Reply-To
<AANLkTineHiG9vCpbJzJ2x9CFjZ7LQeExs7cN5YhoZhft@mail.gmail.com>
Am 8/18/2010 1:27, schrieb Tor Arvid Lund:
Show 11 quoted lines
> I often use git-gui when staging commits, and I noticed that if the
> file I'm working with has a:
> 
> \ No newline at end of file
> 
> ... as the last line of the diff, and I try to "Stage lines for
> commit", then git-gui (or really git-apply, as I understand it) says
> that I have a "corrupt patch at line <so-and-so>".
> 
> Is this a bug? Or is it maybe git-gui that sends something wrong to
> git-apply? I don't know... :-/

This is really a bug in git-gui, not in git-apply: The big while loop in lib/diff.tcl, function apply_range_or_line, must be taught about "\ No newline...".

-- Hannes
Previous: Tor Arvid LundNext: Tor Arvid Lund
Message 4 of 5 in “BUG?: git-apply sometimes says "corrupt patch" when adding single lines”
  1. Tor Arvid LundAug 17, 2010
  2. Jonathan NiederAug 17, 2010
  3. Tor Arvid LundAug 18, 2010
  4. Johannes SixtAug 18, 2010
  5. Tor Arvid LundAug 18, 2010

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.