From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Jul 2017 19:56:19 +0000 (-0700)
Subject: Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake
X-Git-Tag: v2.14.2~46^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc?hp=487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc

Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake

* ls/filter-process-delayed:
convert: add "status=delayed" to filter process protocol
convert: refactor capabilities negotiation
convert: move multiple file filter error handling to separate function
convert: put the flags field before the flag itself for consistent style
t0021: write "OUT <size>" only on success
t0021: make debug log file name configurable
t0021: keep filter log files on comparison
---