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

Re: Rebase fails because of apply.whitespace setting

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 19, 2009, 23:53 UTC
Message-ID
<7vpr8juei7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4ADCF6E9.8090704@feurix.com>
John Feuerstein <john@feurix.com> writes:
Show 8 quoted lines
> I had to rewrite history recently (ugh -- private repo, not shared with
> anybody) and wanted to change the commit message of the root commit.
> During this I've encountered a failing git-rebase if apply.whitespace is
> set to "error".
>
> Should whitespace-errors really be detected when rebasing?
> (or worse: be "fixed" without explicitely asking for it when using a
> global apply.whitespace=fix setting)

I've seen this argued both ways. Some people seem to be happy that they can use rebase with whitespace=fix to clean up their mess. Some people quite rightly oppose it (I am slightly closer to the latter camp myself, but that does not count that much).

I'd agree that whitespace=error won't help anybody here.

Perhaps rebase can be taught to take --whitespace=warn from the command line to override whatever is in the configuration?

Previous: John Feuerstein
Message 2 of 2 in “Rebase fails because of apply.whitespace setting”
  1. John FeuersteinOct 19, 2009
  2. Junio C HamanoOct 19, 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.