On Thursday 28 August 2008 00:36:12 Tor Arvid Lund wrote:
> When this option is passed to git p4 clone, the checkout at the end would
> previously fail. This patch fixes it by optionally creating the master
> branch from refs/heads/p4/master, which is the correct one for this option.
>
> Signed-off-by: Tor Arvid Lund <torarvid@xxxxxxxxx>
Good catch :)
Acked-By: Simon Hausmann <simon@xxxxxx>
Simon
> contrib/fast-import/git-p4 | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index 46136d4..c4b8b4c 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -1733,8 +1733,12 @@ class P4Clone(P4Sync):
> if not P4Sync.run(self, depotPaths):
> return False
> if self.branch != "master":
> - if gitBranchExists("refs/remotes/p4/master"):
> - system("git branch master refs/remotes/p4/master")
> + if self.importIntoRemotes:
> + masterbranch = "refs/remotes/p4/master"
> + else:
> + masterbranch = "refs/heads/p4/master"
> + if gitBranchExists(masterbranch):
> + system("git branch master %s" % masterbranch)
> system("git checkout -f")
> else:
> print "Could not detect main branch. No checkout/master
> branch created."
--
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
