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

Re: [PATCH 5/9] New option --force-delete for git-apply.

From
Junio C Hamano <junkio@cox.net>
Date
Aug 28, 2005, 21:06 UTC
Message-ID
<7vzmr1kbyz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<11252426793534-git-send-email-robfitz@273k.net>
Robert Fitzsimons <robfitz@273k.net> writes:
> Allow the user to force a patch that deletes a file to succeed even
> though the file might still contain data.  Added a test case.
Why?

I've seen cases where git-apply incorrectly thinks a patch leaves some data in a file to be deleted, when incomplete lines are involved. But I think that bug has been fixed, and the only case where you would need this new flag should be dealing with a corrupt/invalid patch.

Previous: Robert FitzsimonsNext: Junio C Hamano
Message 4 of 5 in “Fix processing of a patch file which modifies the same file in git-apply.”
  1. 3/9 Fix processing of a patch file which modifies the same file in git-apply.Robert Fitzsimons, Aug 28, 2005
  2. 4/9 Fix the procssing of multiple patch files with --check in git-apply.Robert Fitzsimons, Aug 28, 2005
  3. 5/9 New option --force-delete for git-apply.Robert Fitzsimons, Aug 28, 2005
  4. Junio C HamanoAug 28, 2005
  5. Junio C HamanoAug 28, 2005

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.