[PATCH v2] Reintegrate: send "Huh?" warnings to stderr, not stdout
- From
- erik@cervined.in <erik@cervined.in>
- Date
- May 4, 2026, 10:28 UTC
- Message-ID
- <20260504102844.74734-2-erik@cervined.in>
- In-Reply-To
- <ae896PlyiYeqldFN@mbp>
From: Erik Cervin-Edin <erik@cervined.in>
In show_merge(), the "Huh?: $msg" warning -- emitted when a first-parent merge subject does not match either "Merge branch '...'" or "Merge remote branch '...'" -- is meant to go to stderr, but the redirect
echo 2>&1 "Huh?: $msg"
goes the wrong way and sends the message to stdout instead.
In the common Reintegrate invocation that captures stdout, e.g.
Meta/Reintegrate next..seen >Meta/redo-seen.sh
this means the warning is silently embedded in the generated heredoc body instead of being printed to the maintainer's terminal, with no diagnostic that something went wrong. Worse, the resulting redo-* script is corrupted with a "Huh?:..." line.
Switch the redirection to ">&2", matching every other diagnostic in this script.
Signed-off-by: Erik Cervin-Edin <erik@cervined.in> --- Reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Reintegrate b/Reintegrate index a1e67a0330..6fdc7c5f41 100755 --- a/Reintegrate +++ b/Reintegrate @@ -327,7 +327,7 @@ show_merge () { merge_hier= ;; *) - echo 2>&1 "Huh?: $msg" + echo >&2 "Huh?: $msg" return ;; esac &&
-- 2.53.0