From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Sep 2017 06:24:06 +0000 (+0900)
Subject: Merge branch 'cc/subprocess-handshake-missing-capabilities'
X-Git-Tag: v2.15.0-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b9db14f52ea40019948d6328f7b6a749840ba284?ds=inline;hp=-c

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
---

b9db14f52ea40019948d6328f7b6a749840ba284
diff --combined sub-process.c
index 6ccfaaba99,ec9a51b7b1..6dde5062be
--- a/sub-process.c
+++ b/sub-process.c
@@@ -6,13 -6,10 +6,13 @@@
  #include "pkt-line.h"
  
  int cmd2process_cmp(const void *unused_cmp_data,
 -		    const struct subprocess_entry *e1,
 -		    const struct subprocess_entry *e2,
 +		    const void *entry,
 +		    const void *entry_or_key,
  		    const void *unused_keydata)
  {
 +	const struct subprocess_entry *e1 = entry;
 +	const struct subprocess_entry *e2 = entry_or_key;
 +
  	return strcmp(e1->cmd, e2->cmd);
  }
  
@@@ -184,8 -181,8 +184,8 @@@ static int handshake_capabilities(struc
  			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);
  		}
  	}