Re: [PATCH] Make git-{pull,rebase} message without tracking information friendlier
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 5, 2012, 07:49 UTC
- Message-ID
- <7vty2332tb.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1330836086.691.87.camel@centaur.lab.cmartin.tk>
I think the updated message is much easier to read, so I've queued this almost as-is (except for minor and obvious typo fixes, e.g. whish) and merged it to 'next'.
Thanks.
By the way, these needed to be squashed in.
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index e647272..370ffdf 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' '