diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-02-16 04:09:28 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 00:57:13 -0800 |
| commit | b7e5348c7f6369554813207a24cf841f48bd8b23 (patch) | |
| tree | 90d30a239e3879d463674d5fdfe7c0b07032db7e | |
| parent | d6d3346babaf19864ea104b0140279e62f32f7e3 (diff) | |
| download | git-b7e5348c7f6369554813207a24cf841f48bd8b23.tar.gz git-b7e5348c7f6369554813207a24cf841f48bd8b23.tar.xz | |
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>
| -rwxr-xr-x | git-svn.perl | 7 | ||||
| -rwxr-xr-x | t/t9107-git-svn-migrate.sh | 1 |
2 files changed, 7 insertions, 1 deletions
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 && |