* [PATCH] git-p4: Fix checkout bug when using --import-local.
@ 2008-08-27 22:36 Tor Arvid Lund
2008-08-28 7:29 ` Simon Hausmann
0 siblings, 1 reply; 2+ messages in thread
From: Tor Arvid Lund @ 2008-08-27 22:36 UTC (permalink / raw)
To: git, Simon Hausmann, Junio C Hamano; +Cc: Tor Arvid Lund
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@gmail.com>
---
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."
--
1.6.0.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-p4: Fix checkout bug when using --import-local.
2008-08-27 22:36 [PATCH] git-p4: Fix checkout bug when using --import-local Tor Arvid Lund
@ 2008-08-28 7:29 ` Simon Hausmann
0 siblings, 0 replies; 2+ messages in thread
From: Simon Hausmann @ 2008-08-28 7:29 UTC (permalink / raw)
To: Tor Arvid Lund; +Cc: git, Junio C Hamano
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@gmail.com>
Good catch :)
Acked-By: Simon Hausmann <simon@lst.de>
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."
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-28 7:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-27 22:36 [PATCH] git-p4: Fix checkout bug when using --import-local Tor Arvid Lund
2008-08-28 7:29 ` Simon Hausmann
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 NNTP newsgroup(s).