From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 May 2016 21:40:04 +0000 (-0700)
Subject: Merge branch 'ld/p4-test-py3' into HEAD
X-Git-Tag: v2.8.3~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=787a490ceee14d456912a1ce8d865be9c92b6f99;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-test-py3' into HEAD

The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.

* ld/p4-test-py3:
  git-p4 tests: time_in_seconds should use $PYTHON_PATH
  git-p4 tests: work with python3 as well as python2
  git-p4 tests: cd to / before running python
---

787a490ceee14d456912a1ce8d865be9c92b6f99