git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Stefan Beller <sbeller@google.com>,
	Junio C Hamano <gitster@pobox.com>, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v2 0/5] am: improve test coverage and touch up foreign patch parsing
Date: Mon, 15 Jun 2015 19:08:08 +0800	[thread overview]
Message-ID: <1434366493-27155-1-git-send-email-pyokagan@gmail.com> (raw)

This is a re-roll of [v1].

Previous versions:

[v1] http://thread.gmane.org/gmane.comp.version-control.git/271053

git-am is able to parse StGit and mercurial patches. However, there are no
regression tests in the test suite for these patch formats, and there are some
small bugs as well:

* the mercurial and stgit patch parsers does not support reading from stdin

* the mercurial patch parser parsed the patch date wrongly and git-am is thus
  unable to reconstruct the exact commit.

Some patches are based on Chris' patch series[1], which I've credited accordingly.

[1] http://thread.gmane.org/gmane.comp.version-control.git/256502


Paul Tan (5):
  t4150: test applying StGit patch
  am: teach StGit patch parser how to read from stdin
  t4150: test applying StGit series
  am: use gmtime() to parse mercurial patch date
  am: teach mercurial patch parser how to read from stdin

 git-am.sh     | 12 +++++----
 t/t4150-am.sh | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 5 deletions(-)

-- 
2.1.4

             reply	other threads:[~2015-06-15 11:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-15 11:08 Paul Tan [this message]
2015-06-15 11:08 ` [PATCH v2 1/5] t4150: test applying StGit patch Paul Tan
2015-06-15 11:08 ` [PATCH v2 2/5] am: teach StGit patch parser how to read from stdin Paul Tan
2015-06-15 11:08 ` [PATCH v2 3/5] t4150: test applying StGit series Paul Tan
2015-06-15 11:08 ` [PATCH v2 4/5] am: use gmtime() to parse mercurial patch date Paul Tan
2015-06-15 11:08 ` [PATCH v2 5/5] am: teach mercurial patch parser how to read from stdin Paul Tan
2015-06-15 19:38 ` [PATCH v2 0/5] am: improve test coverage and touch up foreign patch parsing Junio C Hamano

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=1434366493-27155-1-git-send-email-pyokagan@gmail.com \
    --to=pyokagan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=sbeller@google.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).