From 69dd524993a2f7ab2e31149934b4af7da582c93a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 4 Mar 2020 12:05:34 +0100 Subject: [PATCH] util/scripts/gerrit-rebase: Improve error message I received feedback that people were confused by "Error: foo", so replace it with something more user friendly that serves the same purpose. Change-Id: I17b902a62020109e079437c8d9ffd7ea5979a3a1 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/39274 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- util/scripts/gerrit-rebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/scripts/gerrit-rebase b/util/scripts/gerrit-rebase index 276142d6b9..d051103b60 100755 --- a/util/scripts/gerrit-rebase +++ b/util/scripts/gerrit-rebase @@ -71,7 +71,7 @@ to_matches="$(git log ${common_base}..${to} | \ cut -d: -f2-)" # start rebase process, but fail immediately by enforcing an invalid todo -GIT_SEQUENCE_EDITOR="echo foo >" \ +GIT_SEQUENCE_EDITOR="echo Ignore this error, it's intentional>" \ git rebase -i --onto ${to} ${from} ${to} 2>/dev/null # write new rebase todo