From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70BC0426698 for ; Wed, 21 Jan 2026 21:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769032533; cv=pass; b=n+7YKd81DuG7hexJcj4nEqitFNyOgr1Y6FI3yEsJ8ODjuCAoxmjdmIXOat9UerNEvb3m1aRqHo+xtetTwWJRK7aeIdMmltbuWWryVNAraAdtHOvV2QVgRn6HuGv7+6cz2pmcAyU9MQ9qIOuxen8VLBF+3hLYw0fy4GLhbrKTmEc= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769032533; c=relaxed/simple; bh=BuHeRMszEYM1dp5FxaKadHcH3LsY2j9mwkNNrnTLegQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y4kjPRU8bJ1LBO38ldZ0YFozwKQhhIdZmhp9Iq6DqtB1Y8EATjJJvzaPeEIgBEaFanXdggyfndNW+x4lr5OPWsbKhY5qN1XH9s+qDZMwBV7cqGsyqFhCeRqAGUmiNmiycAW9P/VyD3NDIjg5H9jwBq8GwJrvdgNzi77nA1zAyH4= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b=apmt7Aog; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b="apmt7Aog" ARC-Seal: i=1; a=rsa-sha256; t=1769032505; cv=none; d=zohomail.com; s=zohoarc; b=CIzONikyVRaE0Zmu2oXSI7e6hSJOnCoDgkk9d8gyFC8r9cLy9CsebLCcwd6SaHCMmj29oEBCpUflL8cjy1EAzVx6//KAmVBdJlEIUseptUXIOw6hgcwU3tzHDOnlA5ubFuFUjxXPLdYCQZrmWeZuAfeQVM59VmRnSgVnfT23dHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769032505; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=LzT5rSttg1geMiCjODPMCoMjuITXbGVgMEtwriOSZvM=; b=Mvl8RevBofaaBvb2yDwq1dxVP1WaUiGmuGBU59qbK/ywKHH+ZJkBuZpzhKtJ2nvmELq4zr1hVQu/3a8FPuVT7Yi9cTj7a/4hZ7YM3cuuejn0gmyWk8q7VEmn71aPEsvzvvGm2FC6jjZa3QIw2HOXdKS/fyQUtDxXc1/cOD54VNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.ratiu@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1769032505; s=zohomail; d=collabora.com; i=adrian.ratiu@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=LzT5rSttg1geMiCjODPMCoMjuITXbGVgMEtwriOSZvM=; b=apmt7AogHmxMdOMfG48lgqmp21LqRjtQGUD42Yu0obbiRnkWjycQXKe6+tVSBafh 1CB6ue57sxa79q6aOHcTKJ55zeftnn6kppA4Vyztk13Wxo6+0Z9kNcL8ZF2SdpCcTgS IvNxzVfyZ0gIl+OxEzMUI/Ol4Nv+vK2fSeJcmiYM= Received: by mx.zohomail.com with SMTPS id 1769032503417877.4201354690764; Wed, 21 Jan 2026 13:55:03 -0800 (PST) From: Adrian Ratiu To: git@vger.kernel.org, Jeff King Cc: Emily Shaffer , Junio C Hamano , Patrick Steinhardt , Josh Steadmon , Kristoffer Haugsbakk , Adrian Ratiu , Chris Darroch , "brian m. carlson" Subject: [PATCH v7 06/12] hook: allow separate std[out|err] streams Date: Wed, 21 Jan 2026 23:54:30 +0200 Message-ID: <20260121215436.1473800-7-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.52.0.732.gb351b5166d.dirty In-Reply-To: <20260121215436.1473800-1-adrian.ratiu@collabora.com> References: <20250925125352.1728840-1-adrian.ratiu@collabora.com> <20260121215436.1473800-1-adrian.ratiu@collabora.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External The hook API assumed that all hooks merge stdout to stderr. This assumption is proven wrong by pre-push: some of its users actually expect separate stdout and stderr streams and merging them will cause a regression. Therefore this adds a mechanism to allow pre-push to separate the streams, which will be used in the next commit. The mechanism is generic via struct run_hooks_opt just in case there are any more surprise exceptions like this. Reported-by: Chris Darroch Suggested-by: brian m. carlson Signed-off-by: Adrian Ratiu --- hook.c | 2 +- hook.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hook.c b/hook.c index 5ddd7678d1..fde1f88ce8 100644 --- a/hook.c +++ b/hook.c @@ -81,7 +81,7 @@ static int pick_next_hook(struct child_process *cp, cp->in = -1; } - cp->stdout_to_stderr = 1; + cp->stdout_to_stderr = hook_cb->options->stdout_to_stderr; cp->trace2_hook_name = hook_cb->hook_name; cp->dir = hook_cb->options->dir; diff --git a/hook.h b/hook.h index 2169d4a6bd..7cbeef0a1e 100644 --- a/hook.h +++ b/hook.h @@ -34,6 +34,11 @@ struct run_hooks_opt */ int *invoked_hook; + /** + * Send the hook's stdout to stderr. + */ + unsigned int stdout_to_stderr:1; + /** * Path to file which should be piped to stdin for each hook. */ @@ -80,6 +85,7 @@ struct run_hooks_opt #define RUN_HOOKS_OPT_INIT { \ .env = STRVEC_INIT, \ .args = STRVEC_INIT, \ + .stdout_to_stderr = 1, \ } struct hook_cb_data { -- 2.52.0.732.gb351b5166d.dirty