All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian Rösch" <christian@croesch.de>
To: git@vger.kernel.org
Subject: git add -p does not work with custom comment char currently
Date: Wed, 21 Jun 2017 18:31:34 +0200	[thread overview]
Message-ID: <89d4e348-167e-b201-d243-63b1156b9ed0@croesch.de> (raw)

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


             reply	other threads:[~2017-06-21 16:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-21 16:31 Christian Rösch [this message]
2017-06-21 18:20 ` git add -p does not work with custom comment char currently Jeff King
2017-06-21 19:23   ` [PATCH 0/2] " Jeff King
2017-06-21 19:26     ` [PATCH 1/2] add--interactive: handle EOF in prompt_yesno Jeff King
2017-06-21 19:28     ` [PATCH 2/2] add--interactive: quote commentChar regex Jeff King
2017-06-21 21:12       ` Christian Rösch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=89d4e348-167e-b201-d243-63b1156b9ed0@croesch.de \
    --to=christian@croesch.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.