From: Alberto Bertogli <albertito@gmail.com>
Date: Tue, 14 Aug 2007 04:03:18 +0000 (-0300)
Subject: Allow git-svnimport to take "" as the trunk directory.
X-Git-Tag: v1.5.3-rc5~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0476786e645ae18096d6a63de5fd4b756071b522;p=git.git

Allow git-svnimport to take "" as the trunk directory.

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>
---

diff --git a/git-svnimport.perl b/git-svnimport.perl
index b73d6494d..8c17fb5ae 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -49,7 +49,7 @@ getopts("A:b:C:dDFhiI:l:mM:o:rs:t:T:SP:R:uv") or usage();
 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);