kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-svn: warn instead of dying when commit data is missing 

It is possible to have refs globbed by git-svn which stores data
purely in git; gently skip those instead of dying and assuming
user error.

ref: http://mid.gmane.org/CALi1mtdtNF_GtzyPTbfb7N51wwxsFY7zm8hsgwxr3tHcZZboyg@mail.gmail.com

Suggested-by: Jacob Godserv <jacobgodserv@gmail.com>
Cc: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Wong 2016-07-02 10:33:18 +00:00
parent 19e9542fa2
commit 2af7da9f8f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
perl/Git/SVN.pm
View File

@ -97,8 +97,12 @@ sub resolve_local_globs {
"existing: $existing\n", "existing: $existing\n",
" globbed: $refname\n"; " globbed: $refname\n";
} }
my $u = (::cmt_metadata("$refname"))[0] or die my $u = (::cmt_metadata("$refname"))[0];
"$refname: no associated commit metadata\n"; if (!defined($u)) {
warn
"W: $refname: no associated commit metadata from SVN, skipping\n";
next;
}
$u =~ s!^\Q$url\E(/|$)!! or die $u =~ s!^\Q$url\E(/|$)!! or die
"$refname: '$url' not found in '$u'\n"; "$refname: '$url' not found in '$u'\n";
if ($pathname ne $u) { if ($pathname ne $u) {