From 51e6c55061d7790b71b29012ea8326cb19c15721 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 25 Jan 2009 22:55:55 +0100 Subject: [PATCH] WIP make obsolete! rebase's fake-editor: prepare for "goto" and "merge" commands Earlier, the assumption that we only really get "pick" commands from "git rebase -i" was true, but that will stop. When "rebase -i -p" outputs "goto" and "merge" commands, we need to handle that. Signed-off-by: Johannes Schindelin --- t/lib-rebase.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 t/lib-rebase.sh diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh old mode 100644 new mode 100755 index 6aefe27593..3001883441 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -42,7 +42,7 @@ grep -v '^#' < "$1" > "$1".tmp rm -f "$1" echo 'rebase -i script before editing:' cat "$1".tmp -action=pick +action=\& for line in $FAKE_LINES; do case $line in squash|fixup|edit|reword) @@ -52,8 +52,8 @@ for line in $FAKE_LINES; do ">") echo >> "$1";; *) - sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" - action=pick;; + sed -n "${line}s/^[^ ]*/$action/p" < "$1".tmp >> "$1" + action=\&;; esac done echo 'rebase -i script after editing:' -- 2.11.4.GIT