From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:30 +0000 (-0800)
Subject: Merge branch 'sg/travis-fixes'
X-Git-Tag: v2.16.0-rc0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f62b471d219ffabcd2adf28d3df5cd5bb9aad851;p=thirdparty%2Fgit.git

Merge branch 'sg/travis-fixes'

Assorted updates for TravisCI integration.

* sg/travis-fixes:
  travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output
  travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'
  travis-ci: move setting environment variables to 'ci/lib-travisci.sh'
  travis-ci: introduce a $jobname variable for 'ci/*' scripts
---

f62b471d219ffabcd2adf28d3df5cd5bb9aad851