Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar
- Date: Mon, 9 Jul 2018 09:53:14 +0200 (DST)
- From: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
- Subject: Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar
On Sun, 8 Jul 2018, Daniel Harding wrote:
> I have core.commentChar set in my .gitconfig, and when I tried to run
> git rebase -i -r, I received an error message like the following:
> error: invalid line 3: # Branch <name>
> To fix this, I updated sequencer.c to use the configured commentChar
> for the Branch <name> comments. I also tweaked the tests in t3430 to
> verify todo list generation with a custom commentChar. I'm not sure
> if I took the right approach with that, or if it would be better to
> add additional tests for that case, so feel free to
> tweak/replace/ignore the second commit as appropriate.
Nothing is as powerful as an idea whose time has come. Or as a patch whose
time has come, I guess:
AFAICT the remaining task was to send a new revision of the patch, with
the commit message touched up, to reflect the analysis that it handles the
`auto` setting well.
Your patch adds a regression test in addition, which is very nice.
So maybe you can coordinate with Aaron about that first patch? I really
think that the commit message needs to explain why the `auto` setting is
not a problem here.