@matheusbsbs / matheus-bagliano / commits / 94bc83c593

git_connect: let user override virtual-host we send to daemon

When we connect to a git-daemon at a given host and port, we actually send the string "localhost:9418" to the other side, which allows it to do virtual-hosting lookups. For testing and debugging, we'd like to be able to send arbitrary strings, rather than the hostname we actually connected to. Using "insteadOf" config does not work for this purpose, as the hostname determination happens at a very low level, right before we feed the hostname to our lookup routines. You could use /etc/hosts or similar to get around this, but we cannot do that portably from our test suite. Instead, this patch provides an environment variable that can be used to send an arbitrary string. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 17, 2015 at 03:37 UTC 94bc83c5930c8c73fb0106b629123e2413b371af

1 file changed +11 -1

connect.c

+11 -1

@@ -673,10 +673,20 @@ struct child_process *git_connect(int fd[2], const char *url,

673 printf("Diag: path=%s\n", path ? path : "NULL");

674 conn = NULL;

675 } else if (protocol == PROTO_GIT) {

676 + /*

677 + * Set up virtual host information based on where we will

678 + * connect, unless the user has overridden us in

679 + * the environment.

680 + */

681 + char *target_host = getenv("GIT_OVERRIDE_VIRTUAL_HOST");

682 + if (target_host)

683 + target_host = xstrdup(target_host);

684 + else

685 + target_host = xstrdup(hostandport);

686 +

687 /* These underlying connection commands die() if they

688 * cannot connect.

689 */

679 - char *target_host = xstrdup(hostandport);

690 if (git_use_proxy(hostandport))

691 conn = git_proxy_connect(fd, hostandport);

692 else