--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B3AB96DE02D1\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Apr 2016 12:44:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.558\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.558 tagged_above=-999 required=5 tests=[AWL=0.162,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id iJKKwuCIRxfO for <notmuch@notmuchmail.org>;\r
+ Sun, 10 Apr 2016 12:44:39 -0700 (PDT)\r
+Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com\r
+ [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id 77A1D6DE0008 for\r
+ <notmuch@notmuchmail.org>; Sun, 10 Apr 2016 12:44:39 -0700 (PDT)\r
+Received: by mail-wm0-f65.google.com with SMTP id n3so16822364wmn.1\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Apr 2016 12:44:39 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:cc:subject:date:message-id;\r
+ bh=wtipiigXMrAR3BfFVWkwSIFP/lBSSLRTPfTurYrumxU=;\r
+ b=EZRaJ/YUNJvhNg5jJ1sldQ5Of6LsPWd+NKubQJfkntK/2PGpWsGnk/GC07oiVfx7gv\r
+ Pvp/xv6s3OUUsbaxqn+QAdWinNJ2AXmaVTs8y/76OyUSnmoHe3JnxUn4r2JwDUWQ3H4Q\r
+ AuDNWNweoiRQn4tAIHZrS3wch6f/LkaMHmarpJrgWkdVq76UJLSHy/Smsj+iAzyZXzm1\r
+ X5kFbfocauYU1cYosnosEgtyz9txra+wwZwTEIxFKW06xzP9ENpoSisiywW1Iw8E+ZL5\r
+ BRvr0ILkWDON4Q2wCpGB5wiwc/x9EyFH1PlY8YA0njBeFmstk0dbqVMXoMZ+didfqfjq\r
+ ohzw==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+ bh=wtipiigXMrAR3BfFVWkwSIFP/lBSSLRTPfTurYrumxU=;\r
+ b=JADVJujkRiloGPSNCmlJfye604h/uYtBx0GZzldXa6RGk5ul9q1wH78anb3Bf3Ntub\r
+ yqTyz5q36jmWWBVto0LuzIgcy1Qw/BraS1g1vWdTPuxLzlbx4Y10e0cQfM03qrbdLtxM\r
+ 1dYRCwPM8oopPtGHcL1CFZSaiSlc1gduzKhx8K1atNkyuSSCq5gsNAQlK8xYkcZg3L22\r
+ T1QUH4gXVRLJ9lstqxRkNjosl5W40F8hPcAKaK0/xfsBAZYnpCCkA8bHqSvt2HSg3Lvq\r
+ k/awWkQD2MO3GFqc3yArgAoOUAbZQC2JVu6D9YGopt5GQmRc/axIv3RiSUvXZS/5MkJP\r
+ 8uQw==\r
+X-Gm-Message-State:\r
+ AD7BkJITdYkBPRJcbNvjnu8qObTmf9t+3h1298K944ojBuySbCc4fNT1lv2VKoezffkAjg==\r
+X-Received: by 10.194.187.145 with SMTP id\r
+ fs17mr19835053wjc.179.1460317477298; Sun, 10 Apr 2016 12:44:37 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee7f-102.dhcp.inet.fi.\r
+ [188.238.127.102])\r
+ by smtp.gmail.com with ESMTPSA id u4sm24177252wjz.4.2016.04.10.12.44.36\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sun, 10 Apr 2016 12:44:36 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] test: test one character long directory names at top\r
+ level\r
+Date: Sun, 10 Apr 2016 22:43:21 +0300\r
+Message-Id: <1460317403-13714-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 10 Apr 2016 19:44:47 -0000\r
+\r
+Yes, it's broken. Reported by h01ger on IRC.\r
+---\r
+ test/T050-new.sh | 14 ++++++++++++++\r
+ 1 file changed, 14 insertions(+)\r
+\r
+diff --git a/test/T050-new.sh b/test/T050-new.sh\r
+index 93a6fa94ae7c..174715aa2781 100755\r
+--- a/test/T050-new.sh\r
++++ b/test/T050-new.sh\r
+@@ -169,6 +169,20 @@ output=$(NOTMUCH_NEW --debug)\r
+ test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database\r
+ No new mail. Removed 3 messages."\r
+ \r
++test_begin_subtest "One character directory at top level"\r
++test_subtest_known_broken\r
++\r
++generate_message [dir]=A\r
++generate_message [dir]=A/B\r
++generate_message [dir]=A/B/C\r
++\r
++output=$(NOTMUCH_NEW --debug)\r
++test_expect_equal "$output" "Added 3 new messages to the database."\r
++\r
++# clean up after the broken test to not mess up other tests\r
++rm -rf "${MAIL_DIR}"/A\r
++NOTMUCH_NEW 2>&1 > /dev/null\r
++\r
+ test_begin_subtest "Support single-message mbox"\r
+ cat > "${MAIL_DIR}"/mbox_file1 <<EOF\r
+ From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001\r
+-- \r
+2.1.4\r
+\r