Merge branch 'jc/hidden-refs'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:57 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:57 +0000 (15:25 -0800)
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

1  2 
Documentation/config.txt
builtin/receive-pack.c
refs.c
t/t5516-fetch-push.sh
upload-pack.c

Simple merge
index e8878de45c9474cddd5c713cd7a712bed15a515a,131c1635cb80d4bcf3541f3cb3120a8843dbf8d0..62ba6e7a3d014be01fe01ed497c083f7e44e9d34
@@@ -701,7 -726,9 +723,9 @@@ static void execute_commands(struct com
                                       0, &cmd))
                set_connectivity_errors(commands);
  
 -      if (run_receive_hook(commands, pre_receive_hook, 0)) {
+       reject_updates_to_hidden(commands);
 +      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";
diff --cc refs.c
Simple merge
Simple merge
diff --cc upload-pack.c
Simple merge