Skip to content

Commit

Permalink
Allow git-svnimport to take "" as the trunk directory.
Browse files Browse the repository at this point in the history
Some repositories started with the trunk in "/" and then moved it to the
standard "trunk/" location.

On these repositories, the correct thing would be to call git-svnimport -T "",
but because of the way the options are handled, it uses the default "trunk"
instead of the given empty string. This patch fixes that behaviour.

Reported by Leandro Lucarella <llucax@gmail.com>.

Signed-off-by: Alberto Bertogli <albertito@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Alberto Bertogli authored and Junio C Hamano committed Aug 14, 2007
1 parent 70f6414 commit 0476786
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-svnimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ END
usage if $opt_h;

my $tag_name = $opt_t || "tags";
my $trunk_name = $opt_T || "trunk";
my $trunk_name = defined $opt_T ? $opt_T : "trunk";
my $branch_name = $opt_b || "branches";
my $project_name = $opt_P || "";
$project_name = "/" . $project_name if ($project_name);
Expand Down

0 comments on commit 0476786

Please sign in to comment.