summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-03-09 10:15:39 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-03-20 11:06:12 +0000
commit59e6f3c6e355a93f7eb7c6f919b62874f97ff3ec (patch)
treed3f7d96d7379f38f51bd3b8535edc561b88614b0
parentbf48f6ab1127f3ba6a592f17ec49255f3eea5ffd (diff)
downloadcoreboot-59e6f3c6e355a93f7eb7c6f919b62874f97ff3ec.tar.xz
util/scripts/gerrit-rebase: Fix shell invocation
The single apostrophe confuses the shell that's calling the command. Change-Id: I7d3183e9a612de0121b2d208c06a45645b8d67f6 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39397 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> 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 d051103b60..27ee3c7842 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 Ignore this error, it's intentional>" \
+GIT_SEQUENCE_EDITOR="echo 'Ignore this error, it works around a git-rebase limitation'>" \
git rebase -i --onto ${to} ${from} ${to} 2>/dev/null
# write new rebase todo