]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b57758 1fb3fb4)
Merge branch 'ld/p4-test-py3'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)
commitca158f4633e40fb8a6e7e6b78dc7ad559718a19b
treee1ad86c75391478273f05cbc2e09c16b2857358ctree | snapshot
parent3b577581abdf9ad5a177cfce9e23dba411a6f1aecommit | diff
parent1fb3fb4e6d4709a3b8311deff4b109af67efb514commit | diff
Merge branch 'ld/p4-test-py3'

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
t/lib-git-p4.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.