Merge branch 'va/git-p4-branch'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:16 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:16 +0000 (22:01 -0800)
commitab085174294ff473fbc1aca59f3b4c052e9acd77
tree901c4cbfa2e344d7cc5519b7c0d29be1ad9614d4
parent412a79f4cb5e660a2f1ba550363c20ae5f443a86
parente7d7a56796c457b0a96e58e7638950db824b52af
Merge branch 'va/git-p4-branch'

* va/git-p4-branch:
  t9801: do not overuse test_must_fail
  git-p4: Change p4 command invocation
  git-p4: Add test case for complex branch import
  git-p4: Search for parent commit on branch creation
contrib/fast-import/git-p4