55/c2e1b964e72cab78f283ee4b850b6bab521f17

   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 3FDF3429E50\r
   6         for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 08:35:58 -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 MhjqGQwZ1-kE for <notmuch@notmuchmail.org>;\r
  16         Fri, 16 Aug 2013 08:35:54 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
  18         [18.7.68.35])\r
  19         by olra.theworths.org (Postfix) with ESMTP id B66A0429E3A\r
  20         for <notmuch@notmuchmail.org>; Fri, 16 Aug 2013 08:35:49 -0700 (PDT)\r
  21 X-AuditID: 12074423-b7f168e00000095a-45-520e46d4b3a5\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 5F.C2.02394.4D64E025; Fri, 16 Aug 2013 11:35:49 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r7GFZkoa021710; \r
  27         Fri, 16 Aug 2013 11:35:46 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [216.15.114.40]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r7GFZi2J020146\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Fri, 16 Aug 2013 11:35:45 -0400\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1VAM40-0002va-8E; Fri, 16 Aug 2013 11:35:44 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v3 2/3] reply: Remove extraneous space from generated\r
  41         References\r
  42 Date: Fri, 16 Aug 2013 11:35:42 -0400\r
  43 Message-Id: <1376667343-10863-3-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10.4\r
  45 In-Reply-To: <1376667343-10863-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1376667343-10863-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsUixCmqrHvVjS/IYN5uZos9+7wsrt+cyWzx\r
  49         ZuU8Vgdmj7unuTwOf13I4vFs1S3mAOYoLpuU1JzMstQifbsEroxpRzazFPQLV3SvOsXewLic\r
  50         v4uRk0NCwERi2a3VjBC2mMSFe+vZuhi5OIQE9jFKXL/xhAXC2cgoserIR3YI5w6TxPwdG5kh\r
  51         nLmMEvunbWAB6WcT0JDYtn852CwRAWmJnXdns4LYzALxEm0vtrOD2MICARIHNr0Gq2ERUJWY\r
  52         cLgJzOYVcJCYueEcM8QdihLdzyawgdicAo4Sn/s/gc0XAqrZMW8p2wRG/gWMDKsYZVNyq3Rz\r
  53         EzNzilOTdYuTE/PyUot0zfRyM0v0UlNKNzGCgovdRXkH45+DSocYBTgYlXh4GSbyBgmxJpYV\r
  54         V+YeYpTkYFIS5Z3nyBckxJeUn1KZkVicEV9UmpNafIhRgoNZSYR3qwFQjjclsbIqtSgfJiXN\r
  55         waIkzvvs6dlAIYH0xJLU7NTUgtQimKwMB4eSBO9CV6BGwaLU9NSKtMycEoQ0EwcnyHAeoOF7\r
  56         QGp4iwsSc4sz0yHypxh1OS4cXviJUYglLz8vVUqc1xmkSACkKKM0D24OLCm8YhQHekuY9xRI\r
  57         FQ8wocBNegW0hAloyaQzvCBLShIRUlINjKY3pRok1hs0eyptu76Cc8KUBMa6fwkFSgWSXTF+\r
  58         zGbnub5vbF57L3rbk316Z01qlf7764oLbdN//7L/5Oz2+imnHPdOiNuW+Yp31uneiJDLG3tt\r
  59         6hkEtaKnXvnFK6j7W0T6rNmJyQb189k4/r+Ov5IZclfYNWChz/1XVn6Tq/n0DkyeOHfWSiWW\r
  60         4oxEQy3mouJEAE37aCDlAgAA\r
  61 Cc: tomi.ollila@iki.fi\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Fri, 16 Aug 2013 15:35:58 -0000\r
  75 \r
  76 Previously, the References header code seemed to assume\r
  77 notmuch_message_get_header would return NULL if the header was not\r
  78 present, but it actually returns "".  As a result of this, it was\r
  79 inserting an unnecessary space when concatenating an empty or missing\r
  80 original references header with the new reference.\r
  81 \r
  82 This shows up in only two tests because the text reply format later\r
  83 passes the whole reply template through g_mime_filter_headers, which\r
  84 has the side effect of stripping out this extra space.\r
  85 ---\r
  86  notmuch-reply.c |    7 +++++--\r
  87  test/multipart  |    2 +-\r
  88  test/reply      |    2 +-\r
  89  3 files changed, 7 insertions(+), 4 deletions(-)\r
  90 \r
  91 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  92 index 3b2b58d..472a002 100644\r
  93 --- a/notmuch-reply.c\r
  94 +++ b/notmuch-reply.c\r
  95 @@ -537,9 +537,12 @@ create_reply_message(void *ctx,\r
  96                               "In-Reply-To", in_reply_to);\r
  97  \r
  98      orig_references = notmuch_message_get_header (message, "references");\r
  99 +    if (!orig_references)\r
 100 +       /* Treat errors like missing References headers. */\r
 101 +       orig_references = "";\r
 102      references = talloc_asprintf (ctx, "%s%s%s",\r
 103 -                                 orig_references ? orig_references : "",\r
 104 -                                 orig_references ? " " : "",\r
 105 +                                 *orig_references ? orig_references : "",\r
 106 +                                 *orig_references ? " " : "",\r
 107                                   in_reply_to);\r
 108      g_mime_object_set_header (GMIME_OBJECT (reply),\r
 109                               "References", references);\r
 110 diff --git a/test/multipart b/test/multipart\r
 111 index c974226..2033023 100755\r
 112 --- a/test/multipart\r
 113 +++ b/test/multipart\r
 114 @@ -599,7 +599,7 @@ cat <<EOF >EXPECTED\r
 115   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
 116   "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",\r
 117   "In-reply-to": "<87liy5ap00.fsf@yoom.home.cworth.org>",\r
 118 - "References": " <87liy5ap00.fsf@yoom.home.cworth.org>"},\r
 119 + "References": "<87liy5ap00.fsf@yoom.home.cworth.org>"},\r
 120   "original": {"id": "XXXXX",\r
 121   "match": false,\r
 122   "excluded": false,\r
 123 diff --git a/test/reply b/test/reply\r
 124 index c877ffe..a85ebe5 100755\r
 125 --- a/test/reply\r
 126 +++ b/test/reply\r
 127 @@ -242,7 +242,7 @@ test_expect_equal_json "$output" '\r
 128      "reply-headers": {\r
 129          "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
 130          "In-reply-to": "<'${gen_msg_id}'>",\r
 131 -        "References": " <'${gen_msg_id}'>",\r
 132 +        "References": "<'${gen_msg_id}'>",\r
 133          "Subject": "Re: \u00e0\u00df\u00e7",\r
 134          "To": "\u2603 <snowman@example.com>"\r
 135      }\r
 136 -- \r
 137 1.7.10.4\r
 138 \r