From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:31:52 +0000 (-0700)
Subject: Merge branch 'master' of git://bogomips.org/git-svn
X-Git-Tag: v2.10.0-rc0~133
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/3f933701dc1b6249b050bbc96586929c3ffb6977?hp=627c9f248786df91c5ae6b1a1c9c3b9829c18bf1

Merge branch 'master' of git://bogomips.org/git-svn

* 'master' of git://bogomips.org/git-svn:
git-svn: warn instead of dying when commit data is missing
git-svn: clone: Fail on missing url argument
---

diff --git a/git-svn.perl b/git-svn.perl
index 05eced06cd..f609e54ce3 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -507,7 +507,10 @@ sub init_subdir {
 
 sub cmd_clone {
 	my ($url, $path) = @_;
-	if (!defined $path &&
+	if (!$url) {
+		die "SVN repository location required ",
+		    "as a command-line argument\n";
+	} elsif (!defined $path &&
 	    (defined $_trunk || @_branches || @_tags ||
 	     defined $_stdlayout) &&
 	    $url !~ m#^[a-z\+]+://#) {
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index bee1e7d1cb..018beb85a0 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -97,8 +97,12 @@ sub resolve_local_globs {
 				    "existing: $existing\n",
 				    " globbed: $refname\n";
 			}
-			my $u = (::cmt_metadata("$refname"))[0] or die
-			    "$refname: no associated commit metadata\n";
+			my $u = (::cmt_metadata("$refname"))[0];
+			if (!defined($u)) {
+				warn
+"W: $refname: no associated commit metadata from SVN, skipping\n";
+				next;
+			}
 			$u =~ s!^\Q$url\E(/|$)!! or die
 			  "$refname: '$url' not found in '$u'\n";
 			if ($pathname ne $u) {