X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3400-rebase.sh;h=7788ae02adca18ab1d1f8cf7b76243fbf56377ae;hb=d82829b6128263951569221ca0c00dd143da055c;hp=e647272a01f3ac89e1d08e6b1ffa36a3a543e655;hpb=4d50dbcda574a4618c84c26d0b8b9ef34980a1b7;p=git.git diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index e647272a0..7788ae02a 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -160,14 +160,12 @@ rm -f B test_expect_success 'fail when upstream arg is missing and not on branch' ' git checkout topic && - test_must_fail git rebase >output.out && - grep "You are not currently on a branch" output.out + test_must_fail git rebase ' test_expect_success 'fail when upstream arg is missing and not configured' ' git checkout -b no-config topic && - test_must_fail git rebase >output.out && - grep "branch.no-config.merge" output.out + test_must_fail git rebase ' test_expect_success 'default to @{upstream} when upstream arg is missing' '