From: Ramkumar Ramachandra Date: Wed, 07 Dec 2011 19:36:45 GMT Subject: [PATCH 09/15] t3418 (rebase-continue): fix && chaining Message-ID: <1323286611-4806-10-git-send-email-artagnon@gmail.com> In-Reply-To: <1323286611-4806-1-git-send-email-artagnon@gmail.com> Signed-off-by: Ramkumar Ramachandra --- t/t3418-rebase-continue.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 1e855cd..2680375 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -51,7 +51,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' test_commit "commit-new-file-F3-on-topic-branch" F3 32 && test_when_finished "rm -fr test-bin funny.was.run" && mkdir test-bin && - cat >test-bin/git-merge-funny <<-EOF + cat >test-bin/git-merge-funny <<-EOF && #!$SHELL_PATH case "\$1" in --opt) ;; *) exit 2 ;; esac shift && @@ -77,7 +77,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' test_expect_success 'rebase --continue remembers --rerere-autoupdate' ' rm -fr .git/rebase-* && git reset --hard commit-new-file-F3-on-topic-branch && - git checkout master + git checkout master && test_commit "commit-new-file-F3" F3 3 && git config rerere.enabled true && test_must_fail git rebase -m master topic && -- 1.7.7.3