From d093d07d8455f68596ade22baf7db249e6911e0b Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 6 Jul 2023 11:29:12 -0400
Subject: [PATCH] USHIFT-1402: remove error reporting trap from rebase script

Reporting errors using trap means that pipelines that acceptably
produce no output, such as a grep that finds no results, instead
produce the error message.
---
 scripts/auto-rebase/rebase.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh
index e0c2424659..b75ab8febf 100755
--- a/scripts/auto-rebase/rebase.sh
+++ b/scripts/auto-rebase/rebase.sh
@@ -23,8 +23,6 @@ set -o pipefail
 shopt -s expand_aliases
 shopt -s extglob
 
-trap 'echo "Script exited with error."' ERR
-
 #debugging options
 #trap 'echo "#L$LINENO: $BASH_COMMAND" >&2' DEBUG
 #set -xo functrace