git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 00/14] git p4 branch handling fixes

From
PWPete Wyckoff <pw@padd.com>
Date
Jan 15, 2013, 00:46 UTC
Message-ID
<1358210828-2369-1-git-send-email-pw@padd.com>

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
Next: Pete Wyckoff
Message 1 of 15 in “git p4 branch handling fixes”
  1. 00/14 git p4 branch handling fixesPete Wyckoff, Jan 15, 2013
  2. 01/14 git p4: test sync/clone --branch behaviorPete Wyckoff, Jan 15, 2013
  3. 02/14 git p4: rearrange and simplify hasOrigin handlingPete Wyckoff, Jan 15, 2013
  4. 03/14 git p4: add comments to p4BranchesInGitPete Wyckoff, Jan 15, 2013
  5. 04/14 git p4: inline listExistingP4GitBranchesPete Wyckoff, Jan 15, 2013
  6. 05/14 git p4: create p4/HEAD on initial clonePete Wyckoff, Jan 15, 2013
  7. 06/14 git p4: verify expected refs in clone --bare testPete Wyckoff, Jan 15, 2013
  8. 07/14 git p4: clone --branch should checkout masterPete Wyckoff, Jan 15, 2013
  9. 08/14 git p4 doc: fix branch detection examplePete Wyckoff, Jan 15, 2013
  10. 09/14 git p4: allow short ref names to --branchPete Wyckoff, Jan 15, 2013
  11. 10/14 git p4: rearrange self.initialParent usePete Wyckoff, Jan 15, 2013
  12. 11/14 git p4: fail gracefully on sync with no master branchPete Wyckoff, Jan 15, 2013
  13. 12/14 git p4: fix sync --branch when no master branchPete Wyckoff, Jan 15, 2013
  14. 13/14 git p4 test: keep P4CLIENT changes inside subshellsPete Wyckoff, Jan 15, 2013
  15. 14/14 git p4: fix submit when no master branchPete Wyckoff, Jan 15, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.