summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Marcel Koeppen <git-dev@marzelpan.de>2009-01-19 03:02:01 +0100
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-01-18 19:51:44 -0800
commit22ba47f544a233958c73a9260b18c57b431f44b3 (patch)
tree4c3f92d288f2d98377ad24ceb574803d70ed8e86
parentgit-svn: avoid importing nested git repos (diff)
downloadtgif-22ba47f544a233958c73a9260b18c57b431f44b3.tar.xz
git-svn: Show UUID in svn info for added directories with svn 1.5.5
In svn 1.5.5 the output of "svn info" for added directories was changed and now shows the repository UUID. This patch implements the same behavior for "git svn info" and makes t9119-git-svn-info.17 pass if svn 1.5.5 is used. Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de> 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 55c4dfb968..d4cb538b93 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -912,7 +912,8 @@ sub cmd_info {
if ($@) {
$result .= "Repository Root: (offline)\n";
}
- $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
+ $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
+ ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
$result .= "Node Kind: " .