diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:10 +0900 |
| commit | 1c45e39809ffc643987dd82037f43780605f1e92 (patch) | |
| tree | c4b96ddd2339653ace368aa1f826393c58c88370 | |
| parent | 110a642801e55dcf6e9ffe415dfee3499d2c3c6f (diff) | |
| parent | ab46e6fc7265de3e354d7eaaa7ed7c1e2426171f (diff) | |
| download | git-1c45e39809ffc643987dd82037f43780605f1e92.tar.gz | |
Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint
Finishing touches to a topic already in 'master'.
* cc/subprocess-handshake-missing-capabilities:
subprocess: loudly die when subprocess asks for an unsupported capability
| -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 648b3a3943..80571567f2 100644 --- a/sub-process.c +++ b/sub-process.c @@ -180,8 +180,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); } } |