diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-24 00:59:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-24 00:59:46 +0300 |
| commit | 04cd9996383791cde0e866eb96e516f7646227c3 (patch) | |
| tree | cae258ce91a240e1ffae64d736386d7c9060ed01 /t | |
| parent | d0762243631a782cafeb1ec8d7af60c95e229721 (diff) | |
| parent | 5c29f19cdada762e75939a946df21b44d48d6fff (diff) | |
Merge branch 'dl/checkout-p-merge-base'
Fix to a regression introduced during this cycle.
* dl/checkout-p-merge-base:
checkout -p: handle tree arguments correctly again
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2016-checkout-patch.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh index d91a329eb3..abfd586c32 100755 --- a/t/t2016-checkout-patch.sh +++ b/t/t2016-checkout-patch.sh @@ -123,4 +123,9 @@ test_expect_success PERL 'none of this moved HEAD' ' verify_saved_head ' +test_expect_success PERL 'empty tree can be handled' ' + test_when_finished "git reset --hard" && + git checkout -p $(test_oid empty_tree) -- +' + test_done |