summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-03-04 12:05:34 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-03-07 15:49:59 +0000
commit69dd524993a2f7ab2e31149934b4af7da582c93a (patch)
tree00c87b8d276533c5e13cca23c20532ce9ac2a60f
parent447e33965671450b385b5bec70e5febc10ec9186 (diff)
downloadcoreboot-69dd524993a2f7ab2e31149934b4af7da582c93a.tar.xz
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 <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39274 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rwxr-xr-xutil/scripts/gerrit-rebase2
1 files changed, 1 insertions, 1 deletions
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