Merge branch 'jk/maint-avoid-streaming-filtered-contents'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:38 +0000 (23:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:38 +0000 (23:05 -0800)
commit31e3d834b39b773831c3c3e2637f2d99bfad9cbf
treed7367ae2ee53e3717a37e1bbe5eb9e264994fa75
parentce25054826693df3f3698ae2a64f706dc59c0a28
parent4f22b1015d4203ccdf2b66f27ee5946504342ace
Merge branch 'jk/maint-avoid-streaming-filtered-contents'

* 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