Merge branch 'va/fix-git-p4-tests'
commita59ac46ba4473a6ceed919fefd054c38081531dd
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2015 22:28:32 +0000 (20 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2015 22:28:32 +0000 (20 15:28 -0700)
treeb1a667f59d927eefd103d00458c3e743e63acb5d
parent268d5bc2b2a6f261c6da99c3c9557426468a765b
parentf1f4c84dccba24d606e82d3436c1c4f573712d28
Merge branch 'va/fix-git-p4-tests'

Test fixes for git-p4.

* va/fix-git-p4-tests:
  t9814: guarantee only one source exists in git-p4 copy tests
  git-p4: fix copy detection test
  t9814: fix broken shell syntax in git-p4 rename test