diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:56 -0700 |
| commit | 0f0169d153ddb40628075a5e752ac7fe87ddc958 (patch) | |
| tree | 5b320dde036b253314c812f8b440553751db5b61 /t | |
| parent | Merge branch 'ps/gitweb--browse-chrome' (diff) | |
| parent | rebase: improve error message when upstream argument is missing (diff) | |
| download | tgif-0f0169d153ddb40628075a5e752ac7fe87ddc958.tar.xz | |
Merge branch 'jn/rebase-cmdline-fix'
* jn/rebase-cmdline-fix:
rebase: improve error message when upstream argument is missing
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index dbf7dfba9b..e5691bc5ed 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -126,9 +126,20 @@ test_expect_success 'Show verbose error when HEAD could not be detached' ' test_must_fail git rebase topic 2> output.err > output.out && grep "Untracked working tree file .B. would be overwritten" output.err ' +rm -f B + +test_expect_success 'dump usage when upstream arg is missing' ' + git checkout -b usage topic && + test_must_fail git rebase 2>error1 && + grep "[Uu]sage" error1 && + test_must_fail git rebase --abort 2>error2 && + grep "No rebase in progress" error2 && + test_must_fail git rebase --onto master 2>error3 && + grep "[Uu]sage" error3 && + ! grep "can.t shift" error3 +' test_expect_success 'rebase -q is quiet' ' - rm B && git checkout -b quiet topic && git rebase -q master > output.out 2>&1 && test ! -s output.out |