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

Re: [PATCHv3] git apply: option to ignore whitespace differences

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 29, 2009, 08:39 UTC
Message-ID
<7vws5rx4qt.fsf@alter.siamese.dyndns.org>
In-Reply-To
<cb7bb73a0907290120x72d0ae99p7cfdd2b88264a24a@mail.gmail.com>
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
Show 5 quoted lines
> I was thinking more about consistency than 'correctness'  in this
> case, actually. Typical scenario would be: patch is created for a file
> using a given whitespace convention (e.g. 4 spaces). File is updated
> to match the rest of the project (tabs). Patch would now introduce the
> wrong whitespace convention for the new lines.

You are assuming that the patch is always based on a wrong convention and the target always uses the right convention. In general, however, you cannot tell which way the "consisitency" should go --- often you have to apply a patch based on a fixed codebase to an older version.

Previous: Giuseppe BilottaNext: Giuseppe Bilotta
Message 6 of 15 in “[PATCHv3] git apply: option to ignore whitespace differences”
  1. Giuseppe BilottaJul 28, 2009
  2. Junio C HamanoJul 28, 2009
  3. Giuseppe BilottaJul 29, 2009
  4. Junio C HamanoJul 29, 2009
  5. Giuseppe BilottaJul 29, 2009
  6. Junio C HamanoJul 29, 2009
  7. Giuseppe BilottaJul 29, 2009
  8. Nanako ShiraishiJul 29, 2009
  9. Giuseppe BilottaJul 29, 2009
  10. Felipe ContrerasJul 31, 2009
  11. Junio C HamanoJul 31, 2009
  12. Felipe ContrerasJul 31, 2009
  13. Giuseppe BilottaJul 31, 2009
  14. Junio C HamanoJul 31, 2009
  15. Giuseppe BilottaJul 31, 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.