X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft3400-rebase.sh;h=c3555332366d687d04bfbc031b1be808f3caa802;hb=0e1cfc52de002e2d9b0e6562e8672fee3bf45a67;hp=6eaecec906c49749237b243f772f2e33eb0efedd;hpb=00754b20f931e0e85fe12e59111cf250d51d288b;p=git.git diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 6eaecec90..c35553323 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)" '