Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:10 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:10 +0000 (14:19 +0900)
Finishing touches to a topic already in 'master'.

* cc/subprocess-handshake-missing-capabilities:
  subprocess: loudly die when subprocess asks for an unsupported capability

1  2 
sub-process.c

diff --cc sub-process.c
Simple merge