undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: proper detection of bare repositories

Browse Source 
When in a bare repository (or .git, for that matter), git-svn would fail
to initialise properly, since git rev-parse --show-cdup would not output
anything.  However, git rev-parse --show-cdup actually returns an error
code if it's really not in a git directory.

Fix the issue by checking for an explicit error from git rev-parse, and
setting $git_dir appropriately if instead it just does not output.

Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Deskin Miller 2008-11-06 00:07:39 -05:00 committed by Eric Wong
parent 16fc08e2d8
commit fe4003f630
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-svn.perl
View File

@ -223,11 +223,13 @@ unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
"but it is not a directory\n"; "but it is not a directory\n";
} }
my $git_dir = delete $ENV{GIT_DIR}; my $git_dir = delete $ENV{GIT_DIR};
chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/)); my $cdup = undef;
unless (length $cdup) { git_cmd_try {
die "Already at toplevel, but $git_dir ", $cdup = command_oneline(qw/rev-parse --show-cdup/);
"not found '$cdup'\n"; $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"; chdir $cdup or die "Unable to chdir up to '$cdup'\n";
unless (-d $git_dir) { unless (-d $git_dir) {
die "$git_dir still not found after going to ", die "$git_dir still not found after going to ",

9
t/t9100-git-svn-basic.sh
View File

@ -265,4 +265,13 @@ test_expect_success 'able to set-tree to a subdirectory' "
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
" "
test_expect_success 'git-svn works in a bare repository' '
mkdir bare-repo &&
( cd bare-repo &&
git init --bare &&
GIT_DIR=. git svn init "$svnrepo" &&
git svn fetch ) &&
rm -rf bare-repo
'
test_done test_done