From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 4 May 2006 05:54:00 +0000 (-0700)
Subject: git-svn: support manually placed initial trees from fetch
X-Git-Tag: v1.4.1-rc1~26^2~17^2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6dfbe5163e26e3e1126c9b08c3cb38195e92a82c;p=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>
---

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index d4b932369..54f3d6312 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -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;