Re: Antw: Re: blank lines in pre-created merge message

From: Ulrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date: Jul 30, 2019, 06:52 UTC
Message-ID: <5D3FE919020000A100032932@gwsmtp.uni-regensburg.de>
In-Reply-To: <nycvar.QRO.7.76.6.1907251355500.21907@tvgsbejvaqbjf.bet>

>>> Johannes Schindelin <Johannes.Schindelin@gmx.de> schrieb am 25.07.2019 um

13:58 in Nachricht <nycvar.QRO.7.76.6.1907251355500.21907@tvgsbejvaqbjf.bet>:

Show 5 quoted lines

> Hi Ulrich,
> 
> On Thu, 25 Jul 2019, Ulrich Windl wrote:
> 
>> >>> Johannes Schindelin <Johannes.Schindelin@gmx.de> schrieb am 25.07.2019

um

Show 21 quoted lines

>> 12:07
>> in Nachricht <nycvar.QRO.7.76.6.1907251204310.21907@tvgsbejvaqbjf.bet>:
>> >
>> > On Wed, 24 Jul 2019, Ulrich Windl wrote:
>> >
>> >> When using "git merge ‑‑no‑ff ‑‑no‑commit ..", the pre‑created
>> >> merge message always contains two empty lines in between the
>> >> comment lines. However if there was a merge conflict (being
>> >> resolved) an extra blank line is added after the fiVrst line.
>>
>> [...]
> 
>> Could anybody provide a rough overview how and where these editor
>> comments are created?
> 
> The best bet would be to call `git grep` with text in that pre‑created
> merge message, preferably some text that is most likely fixed, i.e. that
> does not depend on the current worktree/commit.
> 
> If you give me an example of such a merge message, I can provide you
> with the appropriate `git grep` call and the code locations to touch.

Hi!

Sorry for the delay: OK, here is an example where the auto-generated comment has two blank lines: ---snip--- Merge branch 'shared' # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again.

# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # All conflicts fixed but you are still merging. # # Changes to be committed: # new file: .filelist # new file: .gitignore ...more lines omitted ---snip---

> 
> Ciao,
> Johannes