diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:24 -0700 |
| commit | 0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d (patch) | |
| tree | 5fea17cdffbdfbfdb39c16b0f07ffdeb0495a7cb /t/lib-git-daemon.sh | |
| parent | Merge branch 'cc/split-index-config' (diff) | |
| parent | t/interop: add test of old clients against modern git-daemon (diff) | |
| download | git-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.tar.gz git-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.zip | |
Merge branch 'jk/interop-test'
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
* jk/interop-test:
t/interop: add test of old clients against modern git-daemon
t: add an interoperability test harness
Diffstat (limited to 't/lib-git-daemon.sh')
| -rw-r--r-- | t/lib-git-daemon.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh index f9cbd47931..987d40680b 100644 --- a/t/lib-git-daemon.sh +++ b/t/lib-git-daemon.sh @@ -46,7 +46,8 @@ start_git_daemon() { say >&3 "Starting git daemon ..." mkfifo git_daemon_output - git daemon --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \ + ${LIB_GIT_DAEMON_COMMAND:-git daemon} \ + --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \ --reuseaddr --verbose \ --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ |