threads / patch / 42767

patchgit-svn: clone: Fail on missing url argument

Subject: [PATCH] git-svn: clone: Fail on missing url argument

## tl;dr

4 messages between Jul 3, 2016 and Jul 6, 2016. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Christopher Layne· Jul 3, 2016, 05:39 UTC · lore
* cmd_clone should detect a missing $url arg before using it otherwise
  an uninitialized value error is emitted in even the simplest case of
  'git svn clone' without arguments.
Signed-off-by: Christopher Layne <clayne@anodized.com>
---
 git-svn.perl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Show changes to git-svn.perl +4 −1
diff --git a/git-svn.perl b/git-svn.perl
index 05eced0..f609e54 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\+]+://#) {

-- 
2.7.3
Eric Wong· Jul 3, 2016, 06:15 UTC · re: Christopher Layne · lore

Re: [PATCH] git-svn: clone: Fail on missing url argument

Christopher Layne <clayne@anodized.com> wrote:
> * cmd_clone should detect a missing $url arg before using it otherwise
>   an uninitialized value error is emitted in even the simplest case of
>   'git svn clone' without arguments.
Thanks, this patch looks obviously correct.

I've eliminated the '* ' and space prefix from the version I've applied since it's not the convention around here.

> Signed-off-by: Christopher Layne <clayne@anodized.com>
Signed-off-by: Eric Wong <e@80x24.org>
And pushed to "master" of git://bogomips.org/git-svn
(I'll request for Junio to pull within a few days while
 other changes pile up).
Show 6 quoted lines
>  sub cmd_clone {
>  	my ($url, $path) = @_;
> -	if (!defined $path &&
> +	if (!$url) {
> +		die "SVN repository location required ",
> +		    "as a command-line argument\n";

"as a command-line argument" seems like an unnecessary phrase, but I see we use it elsewhere; so it's fine here.

I might be tempted to queue up a separate patch to eliminate this extra statement from the rest of git-svn, though. Not sure if others feel the same way.

Christopher Layne· Jul 3, 2016, 06:49 UTC · re: Eric Wong · lore

Re: [PATCH] git-svn: clone: Fail on missing url argument

Show 14 quoted lines
> On Jul 2, 2016, at 2315 PT, Eric Wong <e@80x24.org> wrote:
>> sub cmd_clone {
>> 	my ($url, $path) = @_;
>> -	if (!defined $path &&
>> +	if (!$url) {
>> +		die "SVN repository location required ",
>> +		    "as a command-line argument\n";
> 
> "as a command-line argument" seems like an unnecessary phrase,
> but I see we use it elsewhere; so it's fine here.
> 
> I might be tempted to queue up a separate patch
> to eliminate this extra statement from the rest of git-svn,
> though.  Not sure if others feel the same way.

I basically went with the same logic/error message that cmd_init() was using a couple of lines down in an attempt to stay consistent:

 527 sub cmd_init {
 528         if (defined $_stdlayout) {
 529                 $_trunk = 'trunk' if (!defined $_trunk);
 530                 @_tags = 'tags' if (! @_tags);
 531                 @_branches = 'branches' if (! @_branches);
 532         }
 533         if (defined $_trunk || @_branches || @_tags) {
 534                 return cmd_multi_init(@_);
 535         }
 536         my $url = shift or die "SVN repository location required ",
 537                                "as a command-line argument\n";
 538         $url = canonicalize_url($url);
 539         init_subdir(@_);
 540         do_git_init_db();
 541 
 542         if ($Git::SVN::_minimize_url eq 'unset') {
 543                 $Git::SVN::_minimize_url = 0;
 544         }
 545 
 546         Git::SVN->init($url);
 547 }
-cl
Junio C Hamano· Jul 6, 2016, 18:15 UTC · re: Eric Wong · lore

Re: [PATCH] git-svn: clone: Fail on missing url argument

Eric Wong <e@80x24.org> writes:
Show 17 quoted lines
> Christopher Layne <clayne@anodized.com> wrote:
>> * cmd_clone should detect a missing $url arg before using it otherwise
>>   an uninitialized value error is emitted in even the simplest case of
>>   'git svn clone' without arguments.
>
> Thanks, this patch looks obviously correct.
>
> I've eliminated the '* ' and space prefix from the version I've
> applied since it's not the convention around here.
>
>> Signed-off-by: Christopher Layne <clayne@anodized.com>
>
> Signed-off-by: Eric Wong <e@80x24.org>
>
> And pushed to "master" of git://bogomips.org/git-svn
> (I'll request for Junio to pull within a few days while
>  other changes pile up).
Thanks.
Show 13 quoted lines
>>  sub cmd_clone {
>>  	my ($url, $path) = @_;
>> -	if (!defined $path &&
>> +	if (!$url) {
>> +		die "SVN repository location required ",
>> +		    "as a command-line argument\n";
>
> "as a command-line argument" seems like an unnecessary phrase,
> but I see we use it elsewhere; so it's fine here.
>
> I might be tempted to queue up a separate patch
> to eliminate this extra statement from the rest of git-svn,
> though.  Not sure if others feel the same way.

If it _can_ come from somewhere else (perhaps a future enhancement may allow you to configure where to clone from? Not likely for cmd_clone but other places in git-svn may be talking about something that could be configured in the future), then "as a command-line argument" is not just unnecessary but actively waiting to harm the users.

But otherwise I do not think anybody cares either way.

← back to recent threads