mirror of
https://github.com/git/git.git
synced 2024-11-18 16:53:53 +01:00
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:
parent
098749d9be
commit
6dfbe5163e
@ -262,7 +262,14 @@ sub fetch {
|
||||
} else {
|
||||
chdir $SVN_WC or croak $!;
|
||||
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);
|
||||
push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
|
||||
|
Loading…
Reference in New Issue
Block a user