From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Mar 2015 05:56:00 +0000 (-0700)
Subject: Merge branch 'rs/daemon-interpolate' into maint
X-Git-Tag: v2.3.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1469d9906833a8bd7d07a70ba8250c823716f20a;p=thirdparty%2Fgit.git

Merge branch 'rs/daemon-interpolate' into maint

"git daemon" looked up the hostname even when "%CH" and "%IP"
interpolations are not requested, which was unnecessary.

* rs/daemon-interpolate:
  daemon: use callback to build interpolated path
  daemon: look up client-supplied hostname lazily
---

1469d9906833a8bd7d07a70ba8250c823716f20a
diff --cc daemon.c
index 26d5f326e4,df9768fecc..c3edd960ec
--- a/daemon.c
+++ b/daemon.c
@@@ -544,10 -577,11 +596,11 @@@ static void parse_host_arg(char *extra_
  				parse_host_and_port(val, &host, &port);
  				if (port) {
  					free(tcp_port);
 -					tcp_port = xstrdup(port);
 +					tcp_port = sanitize_client(port);
  				}
  				free(hostname);
 -				hostname = xstrdup_tolower(host);
 +				hostname = canonicalize_client(host);
+ 				hostname_lookup_done = 0;
  			}
  
  			/* On to the next one */