From 10c9f95b24ce22b6619c6bd5cc9758798ecd88a4 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sun, 26 May 2013 11:45:50 +0300
Subject: [PATCH] v2 of --stderr=FILE patches

---
 d8/5a62edc77b854288e44772fad3270b04f7facf | 78 +++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 d8/5a62edc77b854288e44772fad3270b04f7facf

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