diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-18 08:18:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-18 08:18:11 -0700 |
| commit | a38bb0cc0fc98bf868ad48dc11d229addcca586c (patch) | |
| tree | 5bd66906929bdadf42cd10522b1e71f9dc864654 /t | |
| parent | contrib: update packinfo.pl to not use dashed commands (diff) | |
| parent | Check early that a new branch is new and valid (diff) | |
| download | git-a38bb0cc0fc98bf868ad48dc11d229addcca586c.tar.gz git-a38bb0cc0fc98bf868ad48dc11d229addcca586c.zip | |
Merge branch 'db/maint-checkout-b' into maint
* db/maint-checkout-b:
Check early that a new branch is new and valid
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7201-co.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh index fbec70d3c6..0679abd29d 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -359,4 +359,14 @@ test_expect_success 'checkout an unmerged path should fail' ' test_cmp sample file ' +test_expect_success 'failing checkout -b should not break working tree' ' + git reset --hard master && + git symbolic-ref HEAD refs/heads/master && + test_must_fail git checkout -b renamer side^ && + test $(git symbolic-ref HEAD) = refs/heads/master && + git diff --exit-code && + git diff --cached --exit-code + +' + test_done |