git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Cc: Olivier Delalleau <shish@keba.be>
Subject: [PATCH 00/14] git p4 branch handling fixes
Date: Mon, 14 Jan 2013 19:46:54 -0500	[thread overview]
Message-ID: <1358210828-2369-1-git-send-email-pw@padd.com> (raw)

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

             reply	other threads:[~2013-01-15  0:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-15  0:46 Pete Wyckoff [this message]
2013-01-15  0:46 ` [PATCH 01/14] git p4: test sync/clone --branch behavior Pete Wyckoff
2013-01-15  0:46 ` [PATCH 02/14] git p4: rearrange and simplify hasOrigin handling Pete Wyckoff
2013-01-15  0:46 ` [PATCH 03/14] git p4: add comments to p4BranchesInGit Pete Wyckoff
2013-01-15  0:46 ` [PATCH 04/14] git p4: inline listExistingP4GitBranches Pete Wyckoff
2013-01-15  0:46 ` [PATCH 05/14] git p4: create p4/HEAD on initial clone Pete Wyckoff
2013-01-15  0:47 ` [PATCH 06/14] git p4: verify expected refs in clone --bare test Pete Wyckoff
2013-01-15  0:47 ` [PATCH 07/14] git p4: clone --branch should checkout master Pete Wyckoff
2013-01-15  0:47 ` [PATCH 08/14] git p4 doc: fix branch detection example Pete Wyckoff
2013-01-15  0:47 ` [PATCH 09/14] git p4: allow short ref names to --branch Pete Wyckoff
2013-01-15  0:47 ` [PATCH 10/14] git p4: rearrange self.initialParent use Pete Wyckoff
2013-01-15  0:47 ` [PATCH 11/14] git p4: fail gracefully on sync with no master branch Pete Wyckoff
2013-01-15  0:47 ` [PATCH 12/14] git p4: fix sync --branch when " Pete Wyckoff
2013-01-15  0:47 ` [PATCH 13/14] git p4 test: keep P4CLIENT changes inside subshells Pete Wyckoff
2013-01-15  0:47 ` [PATCH 14/14] git p4: fix submit when no master branch Pete Wyckoff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358210828-2369-1-git-send-email-pw@padd.com \
    --to=pw@padd.com \
    --cc=git@vger.kernel.org \
    --cc=shish@keba.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).