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

Re: [PATCH 6/9] New option --ignore-whitespace for git-apply.

From
A Large Angry SCM <gitzilla@gmail.com>
Date
Aug 28, 2005, 20:49 UTC
Message-ID
<4312235F.2040907@gmail.com>
In-Reply-To
<Pine.LNX.4.58.0508280956320.3317@g5.osdl.org>
Linus Torvalds wrote:
Show 8 quoted lines
> On Sun, 28 Aug 2005, Robert Fitzsimons wrote:
>>Allow the user to force a patch to be applied even though there might
>>be whitespace differences.  Added a test case for the new option.
> 
> If you ignore whitespace, then you should probably accept patches that are
> whitespace corrupted in another way: lines missing the ' ' at the
> beginning. Especially lines that are empty. That's actually the most 
> common form of whitespace corruption there is.

Actually, a more restricted from of --ignore-whitespace may be useful, --ignore-trailing-whitespace (needs a shorter name!). Ignore only trailing whitespace differences (including empty context lines without the initial space).

Previous: Linus TorvaldsNext: Junio C Hamano
Message 4 of 5 in “New option --ignore-whitespace for git-apply.”
  1. 6/9 New option --ignore-whitespace for git-apply.Robert Fitzsimons, Aug 28, 2005
  2. 7/9 New option --ignore-applied for git-apply.Robert Fitzsimons, Aug 28, 2005
  3. Linus TorvaldsAug 28, 2005
  4. A Large Angry SCMAug 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.