git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [patch 11/11] Detect description in quilt patches
Date: Fri, 16 Sep 2005 21:35:25 +0200	[thread overview]
Message-ID: <20050916193525.18681.4203.stgit@zion.home.lan> (raw)
In-Reply-To: <20050916193511.18681.24189.stgit@zion.home.lan>

From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

The current logic imports the whole quilt patch as description - the changes
themselves are correctly applied, luckily, but the description must be fixed up
by hand.
So, detect "Index: " lines as patch start. I've heard rumors that also
Subversion generates this format, so we become compatible with it, too.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 stgit/commands/imprt.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -96,7 +96,8 @@ def __parse_mail(filename = None):
 
     # the rest of the patch description
     for line in f:
-        if re.match('---\s*$', line) or re.match('diff -', line):
+        if re.match('---\s*$', line) or re.match('diff -', line) or \
+                re.match('^Index: ', line):
             break
         else:
             descr += line

      parent reply	other threads:[~2005-09-16 19:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-16 19:35 [patch 01/11] Fix typo: comitter->committer Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 02/11] Make "empty patch" checking optional in "series" command Paolo 'Blaisorblade' Giarrusso
2005-09-17  8:17   ` Catalin Marinas
2005-09-16 19:35 ` [patch 03/11] stg diff / files: don't update directory cache unless needed Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 04/11] Fix "mail" command when description contains "From" lines Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 05/11] Make "stg files" output match "quilt files" one Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 06/11] Avoid allowing --undo if it doesn't change anything Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 07/11] Implement fast-forward when only tree (but not commits) match Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 08/11] Fix "stg clean" when stack is empty Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 09/11] Allow mailing a given patch list Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` [patch 10/11] Fix "stg mail" address parsing for hyphen Paolo 'Blaisorblade' Giarrusso
2005-09-16 19:35 ` Paolo 'Blaisorblade' Giarrusso [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=20050916193525.18681.4203.stgit@zion.home.lan \
    --to=blaisorblade@yahoo.it \
    --cc=catalin.marinas@gmail.com \
    --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 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).