Merge branch 'cc/subprocess-handshake-missing-capabilities'

Finishing touches to a topic already in 'master'.

* cc/subprocess-handshake-missing-capabilities:
  subprocess: loudly die when subprocess asks for an unsupported capability
This commit is contained in:
Junio C Hamano 2017-09-25 15:24:06 +09:00
commit b9db14f52e

View File

@ -184,8 +184,8 @@ static int handshake_capabilities(struct child_process *process,
if (supported_capabilities)
*supported_capabilities |= capabilities[i].flag;
} else {
warning("subprocess '%s' requested unsupported capability '%s'",
process->argv[0], p);
die("subprocess '%s' requested unsupported capability '%s'",
process->argv[0], p);
}
}