From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2013 23:25:57 +0000 (-0800)
Subject: Merge branch 'jc/hidden-refs'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce735bf7fd66c6404e86e5a313f35abc0394b838;p=git.git

Merge branch 'jc/hidden-refs'

Allow the server side to redact the refs/ namespace it shows to the
client.

Will merge to 'master'.

* jc/hidden-refs:
  upload/receive-pack: allow hiding ref hierarchies
  upload-pack: simplify request validation
  upload-pack: share more code
---

ce735bf7fd66c6404e86e5a313f35abc0394b838
diff --cc builtin/receive-pack.c
index e8878de45,131c1635c..62ba6e7a3
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -701,7 -726,9 +723,9 @@@ static void execute_commands(struct com
  				       0, &cmd))
  		set_connectivity_errors(commands);
  
+ 	reject_updates_to_hidden(commands);
+ 
 -	if (run_receive_hook(commands, pre_receive_hook, 0)) {
 +	if (run_receive_hook(commands, "pre-receive", 0)) {
  		for (cmd = commands; cmd; cmd = cmd->next) {
  			if (!cmd->error_string)
  				cmd->error_string = "pre-receive hook declined";