There are multiple oddities in how git-p4 treats multiple p4 branches, as created with "clone" or "sync" and the '--branch' argument. Olivier reported some of these recently in http://thread.gmane.org/gmane.comp.version-control.git/212613 There are two observable behavior changes, but they are in the category of "bug fixes" in my opinion: - p4/HEAD symbolic ref is always created now; it used to be created only after the first sync operation after a clone - using clone --branch now checks out files; it used to complain that there was no p4/master ref Pete Wyckoff (14): git p4: test sync/clone --branch behavior git p4: rearrange and simplify hasOrigin handling git p4: add comments to p4BranchesInGit git p4: inline listExistingP4GitBranches git p4: create p4/HEAD on initial clone git p4: verify expected refs in clone --bare test git p4: clone --branch should checkout master git p4 doc: fix branch detection example git p4: allow short ref names to --branch git p4: rearrange self.initialParent use git p4: fail gracefully on sync with no master branch git p4: fix sync --branch when no master branch git p4 test: keep P4CLIENT changes inside subshells git p4: fix submit when no master branch Documentation/git-p4.txt | 22 +++++-- git-p4.py | 152 ++++++++++++++++++++++++++++++++-------------- t/t9800-git-p4-basic.sh | 9 ++- t/t9806-git-p4-options.sh | 128 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 253 insertions(+), 58 deletions(-) -- 1.8.1.350.gdbf6fd0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html