From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 16 Feb 2007 12:09:28 +0000 (-0800)
Subject: git-svn: hide the private git-svn 'config' file as '.metadata'
X-Git-Tag: v1.5.1-rc1~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7e5348c7f6369554813207a24cf841f48bd8b23;p=git.git

git-svn: hide the private git-svn 'config' file as '.metadata'

Having it named as 'config' prevents us from tracking a
ref named 'config', which is a huge mistake.

On the non-technical side, the word 'config' implies that
a user can freely modify it; but that's not the case
here.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index d7fc9aad5..571259fd0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1286,7 +1286,12 @@ sub get_fetch_range {
 
 sub tmp_config {
 	my (@args) = @_;
-	my $config = "$ENV{GIT_DIR}/svn/config";
+	my $old_def_config = "$ENV{GIT_DIR}/svn/config";
+	my $config = "$ENV{GIT_DIR}/svn/.metadata";
+	if (-e $old_def_config && ! -e $config) {
+		rename $old_def_config, $config or
+		       die "Failed rename $old_def_config => $config: $!\n";
+	}
 	my $old_config = $ENV{GIT_CONFIG};
 	$ENV{GIT_CONFIG} = $config;
 	$@ = undef;
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index a20038b67..dc2afdaa4 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup old-looking metadata' "
 	git-svn init $svnrepo &&
 	git-svn fetch &&
 	mv $GIT_DIR/svn/* $GIT_DIR/ &&
+	mv $GIT_DIR/svn/.metadata $GIT_DIR/ &&
 	rmdir $GIT_DIR/svn &&
 	git-update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
 	git-update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&