97/636727e3a6c5bcaa771d6b9c1d4bfc874b7c13

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 425CB431FAE\r
   6         for <notmuch@notmuchmail.org>; Mon, 12 Aug 2013 11:41:03 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id cnZ0d3GbmTdM for <notmuch@notmuchmail.org>;\r
  16         Mon, 12 Aug 2013 11:40:58 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 76E65431FBC\r
  20         for <notmuch@notmuchmail.org>; Mon, 12 Aug 2013 11:40:53 -0700 (PDT)\r
  21 X-AuditID: 1209190d-b7f078e000000937-98-52092c343689\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 6D.46.02359.43C29025; Mon, 12 Aug 2013 14:40:52 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r7CIeqRp011677; \r
  27         Mon, 12 Aug 2013 14:40:52 -0400\r
  28 Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r7CIemRi003750\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Mon, 12 Aug 2013 14:40:50 -0400\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1V8x2u-0005yg-Nf; Mon, 12 Aug 2013 14:40:48 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH 5/6] reply: Remove extraneous space from generated References\r
  40 Date: Mon, 12 Aug 2013 14:40:38 -0400\r
  41 Message-Id: <1376332839-22825-6-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10.4\r
  43 In-Reply-To: <1376332839-22825-1-git-send-email-amdragon@mit.edu>\r
  44 References: <1376332839-22825-1-git-send-email-amdragon@mit.edu>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixG6nomuiwxlkcPSvqcX1mzOZHRg9nq26\r
  47         xRzAGMVlk5Kak1mWWqRvl8CVMWPhM+aCDoGKDQefszcwfuPpYuTkkBAwkfh8sp0VwhaTuHBv\r
  48         PVsXIxeHkMA+Rok1e7azQzgbGSVO9V1lAqkSEjjCJPH+FydEYi6jxNxJ/9hBEmwCGhLb9i9n\r
  49         BLFFBKQldt6dDTSWg4NZQE3iT5cKSFhYwFdiwfQWsBIWAVWJT99vgrXyCjhIrG5bAHWFokT3\r
  50         swlsIDangKPE/eXnWCD2Okhs3NXDOIGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdI73c\r
  51         zBK91JTSTYygoOGU5N3B+O6g0iFGAQ5GJR7ejI8cQUKsiWXFlbmHGCU5mJREeSdpcgYJ8SXl\r
  52         p1RmJBZnxBeV5qQWH2KU4GBWEuHdwgqU401JrKxKLcqHSUlzsCiJ8z59ejZQSCA9sSQ1OzW1\r
  53         ILUIJivDwaEkwRuqDdQoWJSanlqRlplTgpBm4uAEGc4DNNwdpIa3uCAxtzgzHSJ/ilGX48Lh\r
  54         hZ8YhVjy8vNSpcR5LUCKBECKMkrz4ObAov0VozjQW8K8viBVPMBEATfpFdASJqAlRs0cIEtK\r
  55         EhFSUg2MyeGB6eW9zYltd1kdJ/cWvJW6n6p/PYPxGZt3nfOzmQYbje9f7RZ8s0/l5tbDq2SW\r
  56         XHz46Wd8ULBTWtCLhXHu8xh4Z+wL+haUsDNgnfy2d1rf7zaf7a3ZcezSbamOXXEs0V4r1S1u\r
  57         /2Zk0twosrXo4YpnjxbuORPQ0v3P5k13esG/sz23Voa9VWIpzkg01GIuKk4EAI3c8+rRAgAA\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Mon, 12 Aug 2013 18:41:03 -0000\r
  71 \r
  72 Previously, the References header code seemed to assume\r
  73 notmuch_message_get_header would return NULL if the header was not\r
  74 present, but it actually returns "".  As a result of this, it was\r
  75 inserting an unnecessary space when concatenating an empty or missing\r
  76 original references header with the new reference.\r
  77 \r
  78 This shows up in only one test because the text reply format later\r
  79 passes the whole reply template through g_mime_filter_headers, which\r
  80 has the side effect of stripping out this extra space.\r
  81 ---\r
  82  notmuch-reply.c |   14 ++++++++------\r
  83  test/multipart  |    2 +-\r
  84  2 files changed, 9 insertions(+), 7 deletions(-)\r
  85 \r
  86 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  87 index 3b2b58d..0f3b9cd 100644\r
  88 --- a/notmuch-reply.c\r
  89 +++ b/notmuch-reply.c\r
  90 @@ -537,12 +537,14 @@ create_reply_message(void *ctx,\r
  91                               "In-Reply-To", in_reply_to);\r
  92  \r
  93      orig_references = notmuch_message_get_header (message, "references");\r
  94 -    references = talloc_asprintf (ctx, "%s%s%s",\r
  95 -                                 orig_references ? orig_references : "",\r
  96 -                                 orig_references ? " " : "",\r
  97 -                                 in_reply_to);\r
  98 -    g_mime_object_set_header (GMIME_OBJECT (reply),\r
  99 -                             "References", references);\r
 100 +    if (orig_references) {\r
 101 +       references = talloc_asprintf (ctx, "%s%s%s",\r
 102 +                                     *orig_references ? orig_references : "",\r
 103 +                                     *orig_references ? " " : "",\r
 104 +                                     in_reply_to);\r
 105 +       g_mime_object_set_header (GMIME_OBJECT (reply),\r
 106 +                                 "References", references);\r
 107 +    }\r
 108  \r
 109      return reply;\r
 110  }\r
 111 diff --git a/test/multipart b/test/multipart\r
 112 index c974226..2033023 100755\r
 113 --- a/test/multipart\r
 114 +++ b/test/multipart\r
 115 @@ -599,7 +599,7 @@ cat <<EOF >EXPECTED\r
 116   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
 117   "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",\r
 118   "In-reply-to": "<87liy5ap00.fsf@yoom.home.cworth.org>",\r
 119 - "References": " <87liy5ap00.fsf@yoom.home.cworth.org>"},\r
 120 + "References": "<87liy5ap00.fsf@yoom.home.cworth.org>"},\r
 121   "original": {"id": "XXXXX",\r
 122   "match": false,\r
 123   "excluded": false,\r
 124 -- \r
 125 1.7.10.4\r
 126 \r