diff options
| author |  Simon Hausmann <simon@lst.de> | 2007-05-17 09:02:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-05-17 09:09:05 +0200 |
| commit | f9162f6a4cc9f4af3e527412b364a8eda4502920 (patch) | |
| tree | 41f1fdfc1fdd00eabd9875f55c241cd3d1e877c1 | |
| parent | Fixing syncing (gitdir discovery / cd) for bare repositories (diff) | |
| download | tgif-f9162f6a4cc9f4af3e527412b364a8eda4502920.tar.xz | |
Always pass a sha1 for the initial parent so that git-fast-import doesn't think
it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)
Signed-off-by: Simon Hausmann <simon@lst.de>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 239304857d..1f549b5c62 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -865,7 +865,7 @@ class P4Sync(Command): self.previousDepotPath = "" if len(self.branch) == 0: - self.branch = "p4" + self.branch = "refs/remotes/p4" if len(args) == 0: if not gitBranchExists(self.branch) and gitBranchExists("origin"): @@ -878,11 +878,12 @@ class P4Sync(Command): p4Change = int(p4Change) + 1 self.depotPath = self.previousDepotPath self.changeRange = "@%s,#head" % p4Change - self.initialParent = self.branch + self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-1] if not self.silent: print "Performing incremental import into %s git branch" % self.branch - self.branch = "refs/heads/" + self.branch + if not self.branch.startswith("refs/"): + self.branch = "refs/heads/" + self.branch if len(self.depotPath) != 0: self.depotPath = self.depotPath[:-1] |