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

Suggested improvements to the git-p4 documentation (branch-related)

From
ODOlivier Delalleau <shish@keba.be>
Date
Jan 3, 2013, 20:58 UTC
Message-ID
<CAFXk4bqt_pMVDtVKF-JiQuGbSpy2+_rGOg5RTTE+0pNKFcZh3w@mail.gmail.com>
Hi,

While struggling to get git-p4 to work properly with branches, I thought the documentation on http://git-scm.com/docs/git-p4 could use some improvements:

1. At the end of the "Branch detection" section, the following
commands are provided (for when you want to explicitly provide branch
mappings to git-p4):

git config git-p4.branchList main:branch1 git p4 clone --detect-branches //depot@all

The second command should end with a dot (".") because the first command only works if you are already in a git-initialized folder. Thus I would also suggest to add "git init" as first command to type.

2. Even though having a "main" branch is standard in Perforce, it
would be worth mentioning what happens when you don't: there is a
message "Could not detect main branch. No checkout/master branch
created" output by the "git p4 clone" command. However, it will still
work if you manually set the master branch ("git checkout -b master
remotes/p4/my_custom_main_branch").
3. I don't know what I missed for that one, but I haven't been able to
get the example for the --branch option to work. It says that after
"git init", we can import a p4 branch with:
git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2

However, after doing this, followed by "git checkout -b proj2 remotes/p4/proj2", I am unable to properly use "git p4 sync" or "git p4 submit" from this branch, as git complains about a missing refs/remotes/p4/master. Maybe it only works if "git clone" has been used before? But then why have "git init" first?

NB: it's quite possible some of my problems were caused by me not
properly understanding the doc / how git/p4 works. My apologies if
that's the case.
-=- Olivier
Next: Pete Wyckoff
Message 1 of 6 in “Suggested improvements to the git-p4 documentation (branch-related)”
  1. Olivier DelalleauJan 3, 2013
  2. Pete WyckoffJan 5, 2013
  3. Olivier DelalleauJan 7, 2013
  4. Junio C HamanoFeb 23, 2013
  5. Pete WyckoffFeb 23, 2013
  6. Junio C HamanoFeb 23, 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.