git svn: always reuse existing remotes on fetch

Eric Wong · Eric Wong · commit 4d0157d69959 · 2009-11-22T12:54:59.000-08:00
The internal no_reuse_existing flag is set to allow initializing
multiple remotes with the same URL, common with SVM users.

Unfortunately, this flag caused misbehavior when used
with the -R command-line flag for fetching.

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -428,6 +428,7 @@ sub cmd_fetch {
 	if (@_ > 1) {
 		die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
 	}
+	$Git::SVN::no_reuse_existing = undef;
 	if ($_fetch_parent) {
 		my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
 		unless ($gs) {
@@ -956,6 +957,7 @@ sub cmd_multi_init {
 }
 
 sub cmd_multi_fetch {
+	$Git::SVN::no_reuse_existing = undef;
 	my $remotes = Git::SVN::read_all_remotes();
 	foreach my $repo_id (sort keys %$remotes) {
 		if ($remotes->{$repo_id}->{url}) {

Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,7 @@ sub cmd_fetch {`
`428`	`428`	`if (@_ > 1) {`
`429`	`429`	`die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";`
`430`	`430`	`}`
	`431`	`+ $Git::SVN::no_reuse_existing = undef;`
`431`	`432`	`if ($_fetch_parent) {`
`432`	`433`	`my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');`
`433`	`434`	`unless ($gs) {`
`@@ -956,6 +957,7 @@ sub cmd_multi_init {`
`956`	`957`	`}`
`957`	`958`
`958`	`959`	`sub cmd_multi_fetch {`
	`960`	`+ $Git::SVN::no_reuse_existing = undef;`
`959`	`961`	`my $remotes = Git::SVN::read_all_remotes();`
`960`	`962`	`foreach my $repo_id (sort keys %$remotes) {`
`961`	`963`	`if ($remotes->{$repo_id}->{url}) {`