diff options
| author |  Carlos Martín Nieto <cmn@elego.de> | 2012-03-04 05:41:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-03-04 23:00:57 -0800 |
| commit | 3c02396adc0d8836bccc4fbc95edbb3ca8c1f508 (patch) | |
| tree | 9e90909d778d21ddc608c1a13eeb6bf49d537cf3 /t | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| download | tgif-3c02396adc0d8836bccc4fbc95edbb3ca8c1f508.tar.xz | |
Make git-{pull,rebase} message without tracking information friendlier
The current message is too long and at too low a level for anybody
to understand it if they don't know about the configuration format
already.
The text about setting up a remote is superfluous and doesn't help
understand or recover from the error that has happened. Show the
usage more prominently and explain how to set up the tracking
information. If there is only one remote, that name is used instead
of the generic <remote>.
Also simplify the message we print on detached HEAD to remove
unnecessary information which is better left for the documentation.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index e647272a01..7788ae02ad 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' ' |