From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2019 22:28:20 +0000 (-0800)
Subject: Merge branch 'jt/fetch-v2-sideband'
X-Git-Tag: v2.21.0-rc2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1e112a758e78a1da6422e2ee0700cf283aac234?hp=-c

Merge branch 'jt/fetch-v2-sideband'

"git fetch" and "git upload-pack" learned to send all exchange over
the sideband channel while talking the v2 protocol.

* jt/fetch-v2-sideband:
t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
---

f1e112a758e78a1da6422e2ee0700cf283aac234
diff --combined t/lib-httpd.sh
index 216281eabc,3eb665f4d6..0dfb48c2f6
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@@ -82,7 -82,7 +82,7 @@@ case $(uname) i
  esac
  
  LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
 -LIB_HTTPD_PORT=${LIB_HTTPD_PORT-${this_test#t}}
 +test_set_port LIB_HTTPD_PORT
  
  TEST_PATH="$TEST_DIRECTORY"/lib-httpd
  HTTPD_ROOT_PATH="$PWD"/httpd
@@@ -91,6 -91,7 +91,7 @@@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PA
  # hack to suppress apache PassEnv warnings
  GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND
  GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS
+ GIT_TEST_SIDEBAND_ALL=$GIT_TEST_SIDEBAND_ALL; export GIT_TEST_SIDEBAND_ALL
  GIT_TRACE=$GIT_TRACE; export GIT_TRACE
  
  if ! test -x "$LIB_HTTPD_PATH"
@@@ -131,7 -132,6 +132,7 @@@ prepare_httpd() 
  	mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
  	cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
  	install_script broken-smart-http.sh
 +	install_script error-smart-http.sh
  	install_script error.sh
  	install_script apply-one-time-sed.sh