undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: fix clone when a target directory has been specified

Browse Source 
Several bugs caused this to fail:

* GIT_DIR was set incorrectly after entering the target directory

* Avoid double chdir-ing when clone is called with an explicit path

* create target subdirectory *before* running git-init when using
  the multi-init path

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong 2007-02-23 01:26:26 -08:00
parent a0d7fe3fcd
commit f30603fcf3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-svn.perl
View File

@ -276,7 +276,7 @@ sub init_subdir {
my $repo_path = shift or return;
mkpath([$repo_path]) unless -d $repo_path;
chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
$ENV{GIT_DIR} = $repo_path . "/.git";
$ENV{GIT_DIR} = '.git';
}
sub cmd_clone {
@ -286,12 +286,8 @@ sub cmd_clone {
$url !~ m#^[a-z\+]+://#) {
$path = $url;
}
warn "--path: $path\n" if defined $path;
$path = basename($url) if !defined $path || !length $path;
warn "++path: $path\n" if defined $path;
mkpath([$path]);
chdir $path or die "Couldn't chdir to $path\n";
cmd_init(@_);
cmd_init($url, $path);
Git::SVN::fetch_all($Git::SVN::default_repo_id);
}
@ -459,12 +455,12 @@ sub cmd_multi_init {
unless (defined $_trunk || defined $_branches || defined $_tags) {
usage(1);
}
do_git_init_db();
$_prefix = '' unless defined $_prefix;
if (defined $url) {
$url =~ s#/+$##;
init_subdir(@_);
}
do_git_init_db();
if (defined $_trunk) {
my $trunk_ref = $_prefix . 'trunk';
# try both old-style and new-style lookups: