summaryrefslogtreecommitdiff
path: root/sub-process.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-25 06:24:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-25 06:24:06 (GMT)
commitb9db14f52ea40019948d6328f7b6a749840ba284 (patch)
tree50d876d69d81a17f472ebe76fca2b838a31aad5e /sub-process.c
parentd085f9773a8f53a517a32f0c55a8c49a7cc773a1 (diff)
parentab46e6fc7265de3e354d7eaaa7ed7c1e2426171f (diff)
downloadgit-b9db14f52ea40019948d6328f7b6a749840ba284.zip
git-b9db14f52ea40019948d6328f7b6a749840ba284.tar.gz
git-b9db14f52ea40019948d6328f7b6a749840ba284.tar.bz2
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sub-process.c b/sub-process.c
index 6ccfaab..6dde506 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);
}
}