From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Sep 2017 03:52:26 +0000 (+0900)
Subject: Merge branch 'cc/subprocess-handshake-missing-capabilities' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7d0c272bc8ab81c674c410e464089758fc6a9124?hp=d0e32c567af82c171c66067bb68585ed7f6f46ff

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

Finishing touches to a topic already in 'master'.

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

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);
 		}
 	}