development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Junio C Hamano 2016-07-11 10:31:52 -07:00
parent 627c9f2487 2af7da9f8f
commit 3f933701dc
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
git-svn.perl
View file

@ -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\+]+://#) {

8
perl/Git/SVN.pm
View file

@ -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) {