From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jan 2013 04:15:44 +0000 (-0800)
Subject: Merge branch 'pw/p4-branch-fixes'
X-Git-Tag: v1.8.2-rc0~101
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/801cbd7c71bfc61ebd7dd526ccf43282ef887869?ds=inline;hp=--cc

Merge branch 'pw/p4-branch-fixes'

Fix "git p4" around branch handling.

* pw/p4-branch-fixes:
git p4: fix submit when no master branch
git p4 test: keep P4CLIENT changes inside subshells
git p4: fix sync --branch when no master branch
git p4: fail gracefully on sync with no master branch
git p4: rearrange self.initialParent use
git p4: allow short ref names to --branch
git p4 doc: fix branch detection example
git p4: clone --branch should checkout master
git p4: verify expected refs in clone --bare test
git p4: create p4/HEAD on initial clone
git p4: inline listExistingP4GitBranches
git p4: add comments to p4BranchesInGit
git p4: rearrange and simplify hasOrigin handling
git p4: test sync/clone --branch behavior
---

801cbd7c71bfc61ebd7dd526ccf43282ef887869