Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint
commita09a0c27094f15774e513286c02adacc11b6e6b2
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:40 +0000 (4 22:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 06:16:40 +0000 (4 22:16 -0800)
treed0368dde01b2e8820f169b9264573f479f892679
parentc08afaf7b6675f3780f041870233e31b77ac4ce8
parent4f22b1015d4203ccdf2b66f27ee5946504342ace
Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint

* jk/maint-avoid-streaming-filtered-contents:
  do not stream large files to pack when filters are in use
  teach dry-run convert_to_git not to require a src buffer
  teach convert_to_git a "dry run" mode
convert.c
sha1_file.c