From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 9 Mar 2006 11:52:48 +0000 (-0800)
Subject: contrib/git-svn: fix a harmless warning on rebuild (with old repos)
X-Git-Tag: v1.3.0-rc1~13^2~16
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=779b14462523616cf84ea96690a983605fec2cdc;p=git.git

contrib/git-svn: fix a harmless warning on rebuild (with old repos)

It's only for repositories that were imported with very early
versions of git-svn.  Unfortunately, some of those repos are out
in the wild already, so fix this warning.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 43b50ecf..cf233ef6 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -155,7 +155,7 @@ sub rebuild {
 		# if we merged or otherwise started elsewhere, this is
 		# how we break out of it
 		next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
-		next if (defined $SVN_URL && ($url ne $SVN_URL));
+		next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
 
 		print "r$rev = $c\n";
 		unless (defined $latest) {