From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Oct 2014 19:23:40 +0000 (-0700)
Subject: Merge branch 'jk/test-shell-trace'
X-Git-Tag: v2.2.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9a2fd36169f04f65a71269b9eef47bfe98e8c8f;p=thirdparty%2Fgit.git

Merge branch 'jk/test-shell-trace'

Test scripts were taught to notice "-x" option to show shell trace,
as if the tests were run under "sh -x".

* jk/test-shell-trace:
  test-lib.sh: support -x option for shell-tracing
  t5304: use helper to report failure of "test foo = bar"
  t5304: use test_path_is_* instead of "test -f"
---

f9a2fd36169f04f65a71269b9eef47bfe98e8c8f