[PATCH] git-svn: Simplify calculation of GIT_DIR
From: Barry Wardell <hidden>
Date: 2016-06-15 22:53:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since git-rev-parse already checks for the $GIT_DIR environment variable and that it returns an actual git repository, there is no need to repeat the checks again here. This also fixes a problem where git-svn did not work in cases where .git was a file with a gitdir: link. --- git-svn.perl | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 4334b95..cf2cef8 100755
--- a/git-svn.perl
+++ b/git-svn.perl@@ -15,8 +15,6 @@ my $cmd_dir_prefix = eval { command_oneline([qw/rev-parse --show-prefix/], STDERR => 0) } || ''; -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'; $Git::SVN::Ra::_log_window_size = 100;
@@ -290,28 +288,9 @@ for (my $i = 0; $i < @ARGV; $i++) { } }; -# make sure we're always running at the top-level working directory +# Access an existing repository unless ($cmd && $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}; - my $cdup = undef; - git_cmd_try { - $cdup = command_oneline(qw/rev-parse --show-cdup/); - $git_dir = '.' unless ($cdup); - chomp $cdup if ($cdup); - $cdup = "." unless ($cdup && length $cdup); - } "Already at toplevel, but $git_dir not found\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; - } + $ENV{GIT_DIR} = command_oneline([qw/rev-parse --git-dir/]); $_repository = Git->repository(Repository => $ENV{GIT_DIR}); }
--
1.7.9.2