diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-02-20 09:36:30 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 08:57:13 (GMT) |
| commit | 5253dc33b713e3de63a25305bfc5e966999a0fbe (patch) | |
| tree | c5568c94ca7a689a4c234798223165140aad7c89 /git-svn.perl | |
| parent | 1a97a506043691741f25e8967e76123c1114d1fb (diff) | |
| download | git-5253dc33b713e3de63a25305bfc5e966999a0fbe.zip git-5253dc33b713e3de63a25305bfc5e966999a0fbe.tar.gz git-5253dc33b713e3de63a25305bfc5e966999a0fbe.tar.bz2 | |
git-svn: ensure we're at the top-level and can access $GIT_DIR
If we are run inside a subdirectory of a working tree, we'll
chdir to the top first before touching anything. This also
prevents the accidental creation of .git directories inside
subdirectories since they need metadata.
Noticed by maio on #git
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index b4e8966..a6d98f1 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -9,6 +9,7 @@ use vars qw/ $AUTHOR $VERSION $AUTHOR = 'Eric Wong <normalperson@yhbt.net>'; $VERSION = '@@GIT_VERSION@@'; +my $git_dir_user_set = 1 if defined $ENV{GIT_DIR}; $ENV{GIT_DIR} ||= '.git'; $Git::SVN::default_repo_id = 'svn'; $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn'; @@ -178,6 +179,28 @@ usage(0) if $_help; version() if $_version; usage(1) unless defined $cmd; load_authors() if $_authors; + +# make sure we're always running +unless ($cmd =~ /(?:clone|init|multi-init)$/) { + unless (-d $ENV{GIT_DIR}) { + if ($git_dir_user_set) { + die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ", + "but it is not a directory\n"; + } + my $git_dir = delete $ENV{GIT_DIR}; + chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/)); + unless (length $cdup) { + die "Already at toplevel, but $git_dir ", + "not found '$cdup'\n"; + } + chdir $cdup or die "Unable to chdir up to '$cdup'\n"; + unless (-d $git_dir) { + die "$git_dir still not found after going to ", + "'$cdup'\n"; + } + $ENV{GIT_DIR} = $git_dir; + } +} unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) { Git::SVN::Migration::migration_check(); } |