summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Adam Brewster <adambrewster@gmail.com>2009-08-03 21:40:38 -0400
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-08-10 01:29:40 -0700
commit63de84ad60984105b1cd60fb888968b352539313 (patch)
tree708f47bd125ee9224c760af3179895a637b4ad65
parentsvn: Add && to t9107-git-svn-migrate.sh (diff)
downloadtgif-63de84ad60984105b1cd60fb888968b352539313.tar.xz
svn: Honor --prefix option in init without --stdlayout
Most users who type git svn init file:///tmp/repo --prefix=my-svn/ would expect the root of the svn repository to be tracked by refs/remotes/my-svn/git-svn. Acked-by: Eric Wong <normalperson@yhbt.net>
-rwxr-xr-xgit-svn.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index d075810724..fa8583963b 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3317,7 +3317,8 @@ sub _new {
$repo_id = $Git::SVN::default_repo_id;
}
unless (defined $ref_id && length $ref_id) {
- $_[2] = $ref_id = $Git::SVN::default_ref_id;
+ $_prefix = '' unless defined($_prefix);
+ $_[2] = $ref_id = $_prefix . $Git::SVN::default_ref_id;
}
$_[1] = $repo_id;
my $dir = "$ENV{GIT_DIR}/svn/$ref_id";