From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:21 +0000 (-0700)
Subject: Merge branch 'ab/cond-skip-tests' into maint
X-Git-Tag: v2.13.0-rc0~51^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e25c1229b2f7f12fd3284297a73bb889c8f35f63;p=thirdparty%2Fgit.git

Merge branch 'ab/cond-skip-tests' into maint

A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).

* ab/cond-skip-tests:
  gitweb tests: skip tests when we don't have Time::HiRes
  gitweb tests: change confusing "skip_all" phrasing
  cvs tests: skip tests that call "cvs commit" when running as root
---

e25c1229b2f7f12fd3284297a73bb889c8f35f63