diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:33 -0800 |
| commit | 79587741cbed7704d2e7213c999cf2841af3000d (patch) | |
| tree | ac065e7bd784619dbc5cc47e543860b57f71adb3 /t/t2018-checkout-branch.sh | |
| parent | Merge branch 'na/strtoimax' into maint (diff) | |
| parent | Allow checkout -B <current-branch> to update the current branch (diff) | |
| download | tgif-79587741cbed7704d2e7213c999cf2841af3000d.tar.xz | |
Merge branch 'jn/branch-move-to-self' into maint
* jn/branch-move-to-self:
Allow checkout -B <current-branch> to update the current branch
branch: allow a no-op "branch -M <current-branch> HEAD"
Diffstat (limited to 't/t2018-checkout-branch.sh')
| -rwxr-xr-x | t/t2018-checkout-branch.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 75874e85df..2741262369 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -189,12 +189,13 @@ test_expect_success 'checkout -b <describe>' ' test_cmp expect actual ' -test_expect_success 'checkout -B to the current branch fails before merging' ' +test_expect_success 'checkout -B to the current branch works' ' git checkout branch1 && + git checkout -B branch1-scratch && + setup_dirty_mergeable && - git commit -mfooble && - test_must_fail git checkout -B branch1 initial && - test_must_fail test_dirty_mergeable + git checkout -B branch1-scratch initial && + test_dirty_mergeable ' test_done |