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

[PATCHv2 0/2] git apply: cope with whitespace differences

From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date
Jul 4, 2009, 11:53 UTC
Message-ID
<1246708429-21823-1-git-send-email-giuseppe.bilotta@gmail.com>

This second version includes significant cleanups and improvements to my previous attempt at a --ignore-whitespace option for git-apply.

Following Junio's review, the patch now includes proper handling for leading whitespace (specifically the case when one part has it and the other one doesn't), and more test cases.

The second patch fixes the updating of the postimage when whitespace is adjusted to match the target.

Giuseppe Bilotta (2):
  git apply: option to ignore whitespace differences
  git apply: preserve original whitespace with --ignore-whitespace
 builtin-apply.c                        |  108 +++++++++++++++++++++++++++++---
 contrib/completion/git-completion.bash |    2 +
 git-am.sh                              |    3 +-
 git-rebase.sh                          |    3 +
 t/t4107-apply-ignore-whitespace.sh     |  107 +++++++++++++++++++++++++++++++
 5 files changed, 214 insertions(+), 9 deletions(-)
 create mode 100755 t/t4107-apply-ignore-whitespace.sh
Next: Giuseppe Bilotta
Message 1 of 4 in “[PATCHv2 0/2] git apply: cope with whitespace differences”
  1. Giuseppe BilottaJul 4, 2009
  2. 1/2 git apply: option to ignore whitespace differencesGiuseppe Bilotta, Jul 4, 2009
  3. Ramsay JonesJul 5, 2009
  4. 2/2 git apply: preserve original whitespace with --ignore-whitespaceGiuseppe Bilotta, Jul 4, 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.