From ed0b18e0be27bc23f0b47721713acd872e100efb Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 13 Feb 2009 11:54:26 +0100 Subject: [PATCH] t3413: use REBASE_SCRIPT for bookmark test (WIP: merge with bookmark) Signed-off-by: Johannes Schindelin --- t/t3413-rebase-cmds.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/t/t3413-rebase-cmds.sh b/t/t3413-rebase-cmds.sh index 152bd26135..7dccd0c405 100755 --- a/t/t3413-rebase-cmds.sh +++ b/t/t3413-rebase-cmds.sh @@ -41,10 +41,18 @@ test_expect_success 'goto' ' ' +cat > rebase-script << \EOF +pick C +pick B +bookmark X +goto HEAD^ +pick A +merge X +EOF + test_expect_success 'bookmark' ' - FAKE_LINES="pick C pick B bookmark X goto HEAD^ pick A merge X'"'"'" \ - git rebase -i -p ROOT && + REBASE_SCRIPT=rebase-script git rebase -i -p ROOT && test ROOT = $(subject HEAD^2~2) && test ROOT = $(subject HEAD~3) && test $(git rev-parse C) != $(git rev-parse HEAD~2) && -- 2.11.4.GIT