quoted

quoted

Johannes Schindelin [off-list ref] schrieb am 25.07.2019 um

12:07
in Nachricht [ref]:

Hi Ulrich,

On Wed, 24 Jul 2019, Ulrich Windl wrote:

quoted

I think I had tried bringing this to your attention before, but I think it

was

quoted

without success.
The issue may seem purely cosmetical, while being easy to fix (is my

guess):

quoted

When using "git merge --no-ff --no-commit ..", the pre-created merge

message

quoted

always contains two empty lines in between the comment lines. However if 

there

quoted

was a merge conflict (being resolved) an extra blank line is added after

the

quoted

first line.

In vi those empty lines are easy to spot, and I routinely remove them. But
maybe it's better not to create them at the beginning. (A "normal commit" 

never

quoted

creates any emüpty lines in the pre-created comment)

I could imagine that
https://github.com/gitgitgadget/git/commit/b2f5171ecc2feb4192acd80f5a6b05c06

e099e97
addresses that. Would be good if you could try; just build `pu` from
https://github.com/git/git (`make install` will install it into your
`$HOME/bin` and you can test that easily).

If not, how about giving it a try to fix it yourself? This is open
source, giving you great power to change the entire source code in your
local repository as you wish. And of course, with great power... comes
great responsibility.

I agree, but git isn't a tiny project: Could anybody provide a rough overview
how and where these editor comments are created? Then I could have a look
myself.

quoted

My Git version is 2.12.3, but the bug is probably quite old...

You might think that the bug is probably quite old, but what is really
old is your Git version. The current one is v2.22.0.

With old I mean 1.7.12 or older ;-)

First order of business should be to verify that it has not been fixed
in the meantime ;-)

Yeah, but for a fast-paced project you often find yourself busy with updating
all the time, leaving no time for your productive work (like Android
development).
Don't expect too much from someone that drives as 26 year old car... (it's
easier to handle than the new ones) ;-)

Regards,
Ulrich