v2 of --stderr=FILE patches

diff --git a/d8/5a62edc77b854288e44772fad3270b04f7facf b/d8/5a62edc77b854288e44772fad3270b04f7facf
new file mode 100644 (file)
index 0000000..1c5be22
--- /dev/null
+++ b/d8/5a62edc77b854288e44772fad3270b04f7facf
@@ -0,0 +1,78 @@
+Return-Path: <too@guru-group.fi>\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 83703431FD9\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 01:46:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 6v24niWmhWd8 for <notmuch@notmuchmail.org>;\r
+       Sun, 26 May 2013 01:46:01 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 76F69431FC9\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 01:46:01 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 2363110014D; Sun, 26 May 2013 11:45:57 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: v2 of --stderr=FILE patches \r
+Date: Sun, 26 May 2013 11:45:50 +0300\r
+Message-Id: <1369557954-13439-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\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: Sun, 26 May 2013 08:46:10 -0000\r
+\r
+This is version 2 of id:1369332362-4719-1-git-send-email-tomi.ollila@iki.fi\r
+\r
+ NEWS               |  6 ++++++\r
+ man/man1/notmuch.1 |  7 +++++++\r
+ notmuch-client.h   |  1 +\r
+ notmuch.c          | 32 ++++++++++++++++++++++++++++++++\r
+ test/help-test     |  9 +++++++++\r
+ 5 files changed, 55 insertions(+)\r
+\r
+diffdiff of the changes since v1:\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 77b5282..654a568 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -251,7 +251,8 @@ notmuch_command (notmuch_config_t *config,\r
+     return 0;\r
+ }\r
+ \r
+-static int redirect_stderr (const char * stderr_file)\r
++static int\r
++redirect_stderr (const char * stderr_file)\r
+ {\r
+     if (strcmp (stderr_file, "-") == 0) {\r
+       if (dup2 (STDOUT_FILENO, STDERR_FILENO) < 0) {\r
+diff --git a/test/help-test b/test/help-test\r
+index 8b77931..bd0111c 100755\r
+--- a/test/help-test\r
++++ b/test/help-test\r
+@@ -15,7 +15,6 @@ test_expect_equal "$(cat stderr)" "\r
+ Sorry, % is not a known command. There's not much I can do to help."\r
+ \r
+ test_begin_subtest "notmuch --stderr=- help %"\r
+-notmuch --stderr=stderr help %\r
+ test_expect_equal "$(notmuch --stderr=- help %)" "\r
+ Sorry, % is not a known command. There's not much I can do to help."\r