Merge branch 'pw/convert-pathname-substitution' into next
commitad5234d06aeb060814f93afaf76449f023fc23ee
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 00:24:18 +0000 (4 16:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 00:24:18 +0000 (4 16:24 -0800)
treecedd44986bd872af9127f705c29db655d70a168f
parent2454bfc1327aebdc2df5aadbe37a3327f304966f
parent4290f690676bc14c49c7cddbcda1c09017948718
Merge branch 'pw/convert-pathname-substitution' into next

* pw/convert-pathname-substitution:
  t0021: avoid getting filter killed with SIGPIPE
  convert filter: supply path to external driver