Merge branch 'ls/filter-process-delayed'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:00 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:00 +0000 (13:27 -0700)
commit51b8aecabed1363f13c990320a50e1fb2aa3f696
tree989a4699cd5d3e9a8a645ac67092e66ba62094d7
parenta6f1456380f114e26d68771d9316c57ab468b8fe
parent2841e8f81cb2820024804b9341577be1d0ce1240
Merge branch 'ls/filter-process-delayed'

The filter-process interface learned to allow a process with long
latency give a "delayed" response.

* 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
Documentation/gitattributes.txt
builtin/checkout.c
cache.h
convert.c
convert.h
unpack-trees.c