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

[RFC/PATCH 0/3] More fool-proof "git rebase --whitespace=fix"

From
Björn Gustavsson <bgustavsson@gmail.com>
Date
Feb 17, 2010, 07:02 UTC
Message-ID
<4B7B949B.6020302@gmail.com>

This is the first step in making sure that "git rebase --whitespace=fix HEAD~<number>" will never fail.

As suggested by Junio, the first step consists in changing "git apply whitespace=fix" to be smarter about previously deleted blank lines at the end of the file.

I would be grateful for any feedback on the design decisions and the implementation.
Björn Gustavsson (3):
  apply: Allow blank context lines to match beyond EOF
  t4124: Add additional tests of --whitespace=fix
  t3417: Add test cases for "rebase --whitespace=fix"
 builtin-apply.c                  |  127 ++++++++++++++++++++++++++++++++------
 t/t3417-rebase-whitespace-fix.sh |  126 +++++++++++++++++++++++++++++++++++++
 t/t4124-apply-ws-rule.sh         |   12 ++++
 3 files changed, 246 insertions(+), 19 deletions(-)
 create mode 100755 t/t3417-rebase-whitespace-fix.sh
Message 1 of 1 in “More fool-proof "git rebase --whitespace=fix"”
  1. 0/3 More fool-proof "git rebase --whitespace=fix"Björn Gustavsson, Feb 17, 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.