1 files changed, 10 insertions, 0 deletions
diff --git a/notmuch-extract-patch/notmuch-extract-patch b/notmuch-extract-patch/notmuch-extract-patch
index 7eff31a..d67e542 100755
--- a/notmuch-extract-patch/notmuch-extract-patch
+++ b/notmuch-extract-patch/notmuch-extract-patch
@@ -60,6 +60,15 @@ def get_subject_prefix(s):
     if match:
         return match.group(1).split()
 
+# if Subject: contains [PATCH nn/mm] then any text before that should
+# be stripped, as it should not form part of the commit message.  (The
+# debbugs system prepends 'Bug#nnnnnn: ')
+def munge_subject(msg):
+    match = re.search(r'''\[(.*PATCH.*)\].*$''', msg['subject'])
+    if match:
+        del msg['subject']
+        msg['subject'] = match.group(0)
+
 def main():
     try:
         opts, query = getopt.getopt(sys.argv[1:], "v:", ["reroll-count="])
@@ -81,6 +90,7 @@ def main():
             for m in in_mb:
                 if is_git_patch(m) and has_reroll_count(m, reroll_count):
                     sys.stderr.write(m['subject']+"\n")
+                    munge_subject(m)
                     out_mb.add(m)
             out_mb.flush()
             print(open(out_mb_file.name).read())