[PATCH 5/6] test/dump-restore: Fix quoting on grep

diff --git a/6f/81377d0013da6bd906e2c3623967a439808541 b/6f/81377d0013da6bd906e2c3623967a439808541
new file mode 100644 (file)
index 0000000..432e8ff
--- /dev/null
+++ b/6f/81377d0013da6bd906e2c3623967a439808541
@@ -0,0 +1,76 @@
+Return-Path: <bremner@pivot.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D0437429E2F\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 12:48:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id eWEHW2eNup-d for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Oct 2011 12:48:11 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2B716431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 12:48:11 -0700 (PDT)\r
+Received: from convex-new.cs.unb.ca ([131.202.13.154])\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LJm4Qe002204;\r
+       Fri, 21 Oct 2011 16:48:07 -0300\r
+Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72)\r
+       (envelope-from <bremner@pivot.cs.unb.ca>)\r
+       id 1RHL4W-00016Z-Sq; Fri, 21 Oct 2011 16:48:04 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/6] test/dump-restore: Fix quoting on grep\r
+Date: Fri, 21 Oct 2011 16:47:56 -0300\r
+Message-Id: <1319226477-4181-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1319226477-4181-1-git-send-email-david@tethera.net>\r
+References: <1317317857-29636-1-git-send-email-thomas@schwinge.name>\r
+       <1319226477-4181-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 21 Oct 2011 19:48:12 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+Thanks to Thomas Schwinge for noticing yet another place where quoting\r
+matters. Since the shell translates \. to ., the regex passed to grep\r
+is too generous without the quotes.\r
+---\r
+ test/dump-restore |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 2f8dcc7..a6d6d65 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -69,7 +69,7 @@ test_expect_equal_file dump.expected dump-1-arg-dash.actual\r
+ # Note, we assume all messages from cworth have a message-id\r
+ # containing cworth.org\r
+ \r
+-grep cworth\.org dump.expected > dump-cworth.expected\r
++grep 'cworth\.org' dump.expected > dump-cworth.expected\r
+ \r
+ test_begin_subtest "dump -- from:cworth"\r
+ notmuch dump -- from:cworth > dump-dash-cworth.actual\r
+-- \r
+1.7.5.4\r
+\r