Andrew's git / gitweb.git / diff
?
Merge branch 'mb/fast-import-delete-root'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:34 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:34 +0000 (11:38 -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 patch | diff1 | diff2 | blob | history
t/t9300-fast-import.sh patch | diff1 | diff2 | blob | history
diff --cc fast-import.c
Simple merge
diff --cc t/t9300-fast-import.sh
Simple merge