Merge branch 'mb/fast-import-delete-root' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:47 +0000 (22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:48 +0000 (22:09 -0700)
An attempt to remove the entire tree in the "git fast-import" input
stream caused it to misbehave.

* mb/fast-import-delete-root:
fast-import: fix segfault in store_tree()
t9300: test filedelete command

1  2 
fast-import.c
diff --cc fast-import.c
Simple merge