diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-17 02:18:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-17 02:18:06 +0400 |
| commit | 147d071816c7011d24c195a9d6fca251ad312532 (patch) | |
| tree | dcfc810867c9fb94435f8649cb5ae3b0ab882adc /t | |
| parent | 57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15 (diff) | |
| parent | abe199808c6586047fb7255b80e3d17ffc26bf6c (diff) | |
Merge branch 'jc/checkout-out-of-unborn' into maint
* jc/checkout-out-of-unborn:
git checkout -b: allow switching out of an unborn branch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2015-checkout-unborn.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh index c551d39a66..6352b74e2e 100755 --- a/t/t2015-checkout-unborn.sh +++ b/t/t2015-checkout-unborn.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='checkout from unborn branch protects contents' +test_description='checkout from unborn branch' . ./test-lib.sh test_expect_success 'setup' ' @@ -37,4 +37,13 @@ test_expect_success 'checkout from unborn merges identical index contents' ' git checkout -b new origin ' +test_expect_success 'checking out another branch from unborn state' ' + git checkout --orphan newroot && + git checkout -b anothername && + test_must_fail git show-ref --verify refs/heads/newroot && + git symbolic-ref HEAD >actual && + echo refs/heads/anothername >expect && + test_cmp expect actual +' + test_done |