зеркало из https://github.com/microsoft/git.git
git-svn: support manually placed initial trees from fetch
Sometimes I don't feel like downloading an entire tree again when I actually decide a branch is worth tracking, so some users can get around it more easily with this. Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Родитель
098749d9be
Коммит
6dfbe5163e
|
@ -262,7 +262,14 @@ sub fetch {
|
||||||
} else {
|
} else {
|
||||||
chdir $SVN_WC or croak $!;
|
chdir $SVN_WC or croak $!;
|
||||||
read_uuid();
|
read_uuid();
|
||||||
$last_commit = file_to_s("$REV_DIR/$base->{revision}");
|
eval { $last_commit = file_to_s("$REV_DIR/$base->{revision}") };
|
||||||
|
# looks like a user manually cp'd and svn switch'ed
|
||||||
|
unless ($last_commit) {
|
||||||
|
sys(qw/svn revert -R ./);
|
||||||
|
assert_svn_wc_clean($base->{revision});
|
||||||
|
$last_commit = git_commit($base, @parents);
|
||||||
|
assert_tree($last_commit);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
my @svn_up = qw(svn up);
|
my @svn_up = qw(svn up);
|
||||||
push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
|
push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче