public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt•net>
To: Jonathan Nieder <jrnieder@gmail•com>
Cc: Nicolas Vigier <boklm@mars-attacks•org>, git@vger•kernel.org
Subject: Re: [PATCH] git-svn: fix signed commit parsing
Date: Thu, 10 Oct 2013 06:57:55 +0000	[thread overview]
Message-ID: <20131010065755.GA2413@dcvr.yhbt.net> (raw)
In-Reply-To: <20130930190404.GU9464@google.com>

Jonathan Nieder <jrnieder@gmail•com> wrote:
> Nicolas Vigier wrote:
> 
> > When parsing a commit object, git-svn wrongly think that a line
> > containing spaces means the end of headers and the start of the commit
> > message. In case of signed commit, the gpgsig entry contains a line with
> > one space, so "git svn dcommit" will include part of the signature in
> > the commit message.
> >
> > An example of such problem :
> > http://svnweb.mageia.org/treasurer?view=revision&revision=86
> >
> > This commit changes the regex to only match an empty line as separator
> > between the headers and the commit message.
> >
> > Signed-off-by: Nicolas Vigier <boklm@mars-attacks•org>
> 
> Good catch.  For what it's worth,
> Reviewed-by: Jonathan Nieder <jrnieder@gmail•com>

Thanks both.  I've signed-off, added Jonathan's reviewed-by and
queued this up in my master.  Currently at:

The following changes since commit 128a96c98442524c7f2eeef4757b1e48445f24ce:

  Update draft release notes to 1.8.5 for the fifth batch of topics (2013-09-20 12:42:02 -0700)

are available in the git repository at:

  git://git.bogomips.org/git-svn.git master

for you to fetch changes up to 945b9c14ffd3e11c916ee2b2428a0b2be9645829:

  git-svn.txt: elaborate on rev_map files (2013-10-10 06:56:12 +0000)

----------------------------------------------------------------
Keshav Kini (4):
      git-svn.txt: fix AsciiDoc formatting error
      git-svn.txt: reword description of gc command
      git-svn.txt: replace .git with $GIT_DIR
      git-svn.txt: elaborate on rev_map files

Nicolas Vigier (1):
      git-svn: fix signed commit parsing

 Documentation/git-svn.txt | 46 +++++++++++++++++++++++++++++++++-------------
 git-svn.perl              |  2 +-
 2 files changed, 34 insertions(+), 14 deletions(-)
-- 
Eric Wong

      reply	other threads:[~2013-10-10  6:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-30 14:46 [PATCH] git-svn: fix signed commit parsing Nicolas Vigier
2013-09-30 19:04 ` Jonathan Nieder
2013-10-10  6:57   ` Eric Wong [this message]

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=20131010065755.GA2413@dcvr.yhbt.net \
    --to=normalperson@yhbt$(echo .)net \
    --cc=boklm@mars-attacks$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jrnieder@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox