Merge branch 'nb/gnome-keyring-build' into maint

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b2c14e2ff5485f49af83530ce1b1921c99641f5c..d94d01cfdc8e4bcae2673b2421ef6e48fd69fb24 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -97,7 +97,8 @@ sub resolve_local_globs {
                                    "existing: $existing\n",
                                    " globbed: $refname\n";
                        }
-                       my $u = (::cmt_metadata("$refname"))[0];
+                       my $u = (::cmt_metadata("$refname"))[0] or die
+                           "$refname: no associated commit metadata\n";
                        $u =~ s!^\Q$url\E(/|$)!! or die
                          "$refname: '$url' not found in '$u'\n";
                        if ($pathname ne $u) {