diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 09:24:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 09:24:06 +0300 |
| commit | b9db14f52ea40019948d6328f7b6a749840ba284 (patch) | |
| tree | 50d876d69d81a17f472ebe76fca2b838a31aad5e /sub-process.c | |
| parent | d085f9773a8f53a517a32f0c55a8c49a7cc773a1 (diff) | |
| parent | ab46e6fc7265de3e354d7eaaa7ed7c1e2426171f (diff) | |
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
Diffstat (limited to 'sub-process.c')
| -rw-r--r-- | sub-process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub-process.c b/sub-process.c index 6ccfaaba99..6dde5062be 100644 --- a/sub-process.c +++ b/sub-process.c @@ -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); } } |