git add -p does not work with custom comment char currently

Hi,

my ~/.gitconfig contains

[core]
    commentchar = $

as far as I can see with 2.13.0 and 2.13.1.516.g05ec6e1 (built from source) if I do

$ git add -p

and edit the hunk manually the comment char is not parsed correctly:

Stage this hunk [y,n,q,a,d,/,s,e,?]? e warning: recount: unexpected line: $ Manual hunk edit mode -- see bottom for a quick guide.

error: corrupt patch at line 6 Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? n

As far as I can tell this is a bug but it would be nice if you could let me know if it works for you with a custom comment char.

Thanks in advance, Christian