git-svn: reduce stat() calls for a backwards compatibility check

Eric Wong · gitster · commit 38570a47fcd9 · 2007-06-13T11:23:51.000-07:00
Also, this fixes a bug where in an odd case a remote named
"config" could get renamed to ".metadata".

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -1457,7 +1457,7 @@ sub tmp_config {
 	my (@args) = @_;
 	my $old_def_config = "$ENV{GIT_DIR}/svn/config";
 	my $config = "$ENV{GIT_DIR}/svn/.metadata";
-	if (-e $old_def_config && ! -e $config) {
+	if (! -f $config && -f $old_def_config) {
 		rename $old_def_config, $config or
 		       die "Failed rename $old_def_config => $config: $!\n";
 	}

Original file line number	Diff line number	Diff line change
`@@ -1457,7 +1457,7 @@ sub tmp_config {`
`1457`	`1457`	`my (@args) = @_;`
`1458`	`1458`	`my $old_def_config = "$ENV{GIT_DIR}/svn/config";`
`1459`	`1459`	`my $config = "$ENV{GIT_DIR}/svn/.metadata";`
`1460`		`- if (-e $old_def_config && ! -e $config) {`
	`1460`	`+ if (! -f $config && -f $old_def_config) {`
`1461`	`1461`	`rename $old_def_config, $config or`
`1462`	`1462`	`die "Failed rename $old_def_config => $config: $!\n";`
`1463`	`1463`	`}`