diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:31:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:31:08 -0700 |
| commit | 88dccb6c989735e2faa24fa78d441a7a1c998b36 (patch) | |
| tree | 380c7a391b6d775df53d9446a0bec23e7a870783 /t | |
| parent | Merge branch 'jk/filter-branch-come-back-to-original' (diff) | |
| parent | branch: give advice when tracking start-point is missing (diff) | |
| download | tgif-88dccb6c989735e2faa24fa78d441a7a1c998b36.tar.xz | |
Merge branch 'jk/set-upstream-error-cases'
The handing by "git branch --set-upstream-to" against various forms
of errorneous inputs were suboptimal.
* jk/set-upstream-error-cases:
branch: give advice when tracking start-point is missing
branch: mention start_name in set-upstream error messages
branch: improve error message for missing --set-upstream-to ref
branch: factor out "upstream is not a branch" error messages
t3200: test --set-upstream-to with bogus refs
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 8311c7da44..d969f0ecd8 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -409,6 +409,18 @@ test_expect_success '--set-upstream-to fails on detached HEAD' ' git checkout - ' +test_expect_success '--set-upstream-to fails on a missing dst branch' ' + test_must_fail git branch --set-upstream-to master does-not-exist +' + +test_expect_success '--set-upstream-to fails on a missing src branch' ' + test_must_fail git branch --set-upstream-to does-not-exist master +' + +test_expect_success '--set-upstream-to fails on a non-ref' ' + test_must_fail git branch --set-upstream-to HEAD^{} +' + test_expect_success 'use --set-upstream-to modify HEAD' ' test_config branch.master.remote foo && test_config branch.master.merge foo && |