Merge branch 'mb/fast-import-delete-root' into maint
commit5b830a8588f7d20a18e9ce7c886085ddfd7127d7
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:47 +0000 (29 22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:48 +0000 (29 22:09 -0700)
tree404386fc052756d02ea1489914752db51c5d5df3
parent46092ebf224d45464ef5663544b19b38b95a51c9
parent2668d692eb1af63097628447f2e0c783b1a45e2e
Merge branch 'mb/fast-import-delete-root' into maint

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
fast-import.c