From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Mon, 24 Jun 2019 16:01:55 GMT
Subject: Git 2.22 , --preserve-merges fails with custom commentChar
Message-ID: <68F548D4-DF5A-411E-AAB7-33C9DBF9B658@jetbrains.com>

Hello,

I know —preserve-merges is deprecated now and —rebase-merges should be used instead, however it is still possible to pass —preserve-merges flag, so the issue seems worth reporting.

In git 2.22, —preserve-merges does not work when custom commentchar is used. It shows the editor to select options bu then fails:

➜  ProjectRoot git:(master) git -c core.quotepath=false -c log.showSignature=false -c core.commentChar=@ rebase --interactive --preserve-merges --no-autosquash 554597b2e2c73e636b9c0cdf24dacba38568d02b
warning: git rebase --preserve-merges is deprecated. Use --rebase-merges instead.
error: invalid line 6: @ Rebase 554597b..a8702dd onto 554597b (4 commands)
error: invalid line 6: @ Rebase 554597b..0607564 onto 554597b (4 commands)
error: invalid line 7: @
error: invalid line 8: @ Commands:
error: invalid line 9: @ p, pick <commit> = use commit
error: invalid line 10: @ r, reword <commit> = use commit, but edit the commit message
error: invalid line 11: @ e, edit <commit> = use commit, but stop for amending
error: invalid line 12: @ s, squash <commit> = use commit, but meld into previous commit
error: invalid line 13: @ f, fixup <commit> = like "squash", but discard this commit's log message
error: invalid line 14: @ x, exec <commit> = run command (the rest of the line) using shell
error: invalid line 15: @ d, drop <commit> = remove commit
error: invalid line 16: @ l, label <label> = label current HEAD with a name
error: invalid line 17: @ t, reset <label> = reset HEAD to a label
error: invalid line 18: @ m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
error: invalid line 19: @ .       create a merge commit using the original merge commit's
error: invalid line 20: @ .       message (or the oneline, if no original merge commit was
error: invalid line 21: @ .       specified). Use -c <commit> to reword the commit message.
error: invalid line 22: @
error: invalid line 23: @ These lines can be re-ordered; they are executed from top to bottom.
error: invalid line 24: @
error: invalid line 25: @ If you remove a line here THAT COMMIT WILL BE LOST.
error: invalid line 26: @
error: invalid line 27: @ However, if you remove everything, the rebase will be aborted.
error: invalid line 28: @
error: invalid line 29: @ Note that empty commits are commented out
error: unusable todo list: '.git/rebase-merge/git-rebase-todo'
error: invalid line 6: @ Rebase 554597b..0607564 onto 554597b (4 commands)
error: invalid line 7: @
error: invalid line 8: @ Commands:
error: invalid line 9: @ p, pick <commit> = use commit
error: invalid line 10: @ r, reword <commit> = use commit, but edit the commit message
error: invalid line 11: @ e, edit <commit> = use commit, but stop for amending
error: invalid line 12: @ s, squash <commit> = use commit, but meld into previous commit
error: invalid line 13: @ f, fixup <commit> = like "squash", but discard this commit's log message
error: invalid line 14: @ x, exec <commit> = run command (the rest of the line) using shell
error: invalid line 15: @ d, drop <commit> = remove commit
error: invalid line 16: @ l, label <label> = label current HEAD with a name
error: invalid line 17: @ t, reset <label> = reset HEAD to a label
error: invalid line 18: @ m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
error: invalid line 19: @ .       create a merge commit using the original merge commit's
error: invalid line 20: @ .       message (or the oneline, if no original merge commit was
error: invalid line 21: @ .       specified). Use -c <commit> to reword the commit message.
error: invalid line 22: @
error: invalid line 23: @ These lines can be re-ordered; they are executed from top to bottom.
error: invalid line 24: @
error: invalid line 25: @ If you remove a line here THAT COMMIT WILL BE LOST.
error: invalid line 26: @
error: invalid line 27: @ However, if you remove everything, the rebase will be aborted.
error: invalid line 28: @
error: invalid line 29: @ Note that empty commits are commented out