diff options
| author | Maxim Bublis <satori@yandex-team.ru> | 2014-08-29 11:53:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-29 17:31:14 (GMT) |
| commit | 2668d692eb1af63097628447f2e0c783b1a45e2e (patch) | |
| tree | 941bfb5a89e5a0b21c797d560eb804272130434c /t/t9300-fast-import.sh | |
| parent | 8d30d8a89aa9bf8dfb477cb127af58448bbe9b96 (diff) | |
| download | git-2668d692eb1af63097628447f2e0c783b1a45e2e.zip git-2668d692eb1af63097628447f2e0c783b1a45e2e.tar.gz git-2668d692eb1af63097628447f2e0c783b1a45e2e.tar.bz2 | |
fast-import: fix segfault in store_tree()
Branch tree is NULLified by filedelete command if we are trying
to delete root tree. Add sanity check and use load_tree() in that case.
Signed-off-by: Maxim Bublis <satori@yandex-team.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 9cf5e45..d400442 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -3107,7 +3107,7 @@ D "" INPUT_END -test_expect_failure 'U: filedelete root succeeds' ' +test_expect_success 'U: filedelete root succeeds' ' git fast-import <input ' @@ -3117,7 +3117,7 @@ EOF git diff-tree -M -r U^1 U >actual -test_expect_failure 'U: validate root delete result' ' +test_expect_success 'U: validate root delete result' ' compare_diff_raw expect actual ' |