From: Ramkumar Ramachandra Date: Wed, 07 Dec 2011 19:36:46 GMT Subject: [PATCH 10/15] t3400 (rebase): fix && chaining Message-ID: <1323286611-4806-11-git-send-email-artagnon@gmail.com> In-Reply-To: <1323286611-4806-1-git-send-email-artagnon@gmail.com> Signed-off-by: Ramkumar Ramachandra --- t/t3400-rebase.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 6eaecec..c355533 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -172,8 +172,8 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_expect_success 'default to @{upstream} when upstream arg is missing' ' git checkout -b default topic && - git config branch.default.remote . - git config branch.default.merge refs/heads/master + git config branch.default.remote . && + git config branch.default.merge refs/heads/master && git rebase && test "$(git rev-parse default~1)" = "$(git rev-parse master)" ' -- 1.7.7.3