diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:06 -0800 |
| commit | 4b4ec3fc6480312515e1ec3d827c1308c00adc1e (patch) | |
| tree | 1706a0bb7bc9cd330ba65e446bd4272679d94342 /t | |
| parent | 2917e22496496dca8b42cf033ba3169c187c16fb (diff) | |
| parent | 3c02396adc0d8836bccc4fbc95edbb3ca8c1f508 (diff) | |
| download | git-4b4ec3fc6480312515e1ec3d827c1308c00adc1e.tar.gz git-4b4ec3fc6480312515e1ec3d827c1308c00adc1e.tar.xz | |
Merge branch 'cn/pull-rebase-message'
By Carlos MartÃn Nieto
* cn/pull-rebase-message:
Make git-{pull,rebase} message without tracking information friendlier
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 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' ' |