From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 May 2017 04:46:07 +0000 (+0900)
Subject: Merge branch 'jt/push-options-doc'
X-Git-Tag: v2.14.0-rc0~176
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c980083bc404cb62fb87c76d331c48a44c5f50d

Merge branch 'jt/push-options-doc'

The receive-pack program now makes sure that the push certificate
records the same set of push options used for pushing.

* jt/push-options-doc:
receive-pack: verify push options in cert
docs: correct receive.advertisePushOptions default
---

3c980083bc404cb62fb87c76d331c48a44c5f50d
diff --cc builtin/receive-pack.c
index 0bb36d584d,ed21142349..1b29975c52
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -495,8 -495,8 +498,8 @@@ static char *find_header(const char *ms
  
  static const char *check_nonce(const char *buf, size_t len)
  {
- 	char *nonce = find_header(buf, len, "nonce");
+ 	char *nonce = find_header(buf, len, "nonce", NULL);
 -	unsigned long stamp, ostamp;
 +	timestamp_t stamp, ostamp;
  	char *bohmac, *expect = NULL;
  	const char *retval = NONCE_BAD;