diff options
| author |  Kevin Green <Kevin.Green@morganstanley.com> | 2007-06-11 16:48:07 -0400 |
|---|---|---|
| committer |  Simon Hausmann <simon@lst.de> | 2007-06-11 23:15:38 +0200 |
| commit | c3bf3f1301319faab7344e2d8b5ab10a3d648856 (patch) | |
| tree | 552dbeb5aa2c4df608a94f61c7aec2a8c002549c /contrib/fast-import | |
| parent | Write out the options tag in the log message of imports only if we actually have (diff) | |
| download | tgif-c3bf3f1301319faab7344e2d8b5ab10a3d648856.tar.xz | |
git-p4: check for existence of repo dir before trying to create
When using git-p4 in this manner:
git-p4 clone //depot/path/project myproject
If "myproject" already exists as a dir, but not a valid git repo, it fails
to create the directory.
Signed-off-by: Kevin Green <Kevin.Green@morganstanley.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index e380c149b4..cababc7fc8 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1400,7 +1400,8 @@ class P4Clone(P4Sync): self.cloneDestination = self.defaultDestination(args) print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination) - os.makedirs(self.cloneDestination) + if not os.path.exists(self.cloneDestination): + os.makedirs(self.cloneDestination) os.chdir(self.cloneDestination) system("git init") self.gitdir = os.getcwd() + "/.git" |