[BUG] git svn accepts to clone an empty SVN repo, but then fails to dcommit

Matthieu Moy· Apr 24, 2008, 18:06 UTC · lore

Hi,

All is in the title ;-).

The command

  git svn clone (URL of an empty SVN repo here)

diff --git a/git-svn.perl b/git-svn.perl
index b864b54..9a70c1e 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -410,10 +410,12 @@ sub cmd_dcommit {
        $head ||= 'HEAD';
        my @refs;
        my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
-       print "Committing to $url ...\n";
+       if ($url) {
+               print "Committing to $url ...\n";
+       }
        unless ($gs) {
                die "Unable to determine upstream SVN information from ",
-                   "$head history\n";
+                   "$head history.\nPerhaps the repository is empty.";
        }
        my $last_rev;
        my ($linear_refs, $parents) = linearize_history($gs, \@refs);

-- 
Matthieu

Re: [BUG] git svn accepts to clone an empty SVN repo, but then fails to dcommit

Matthieu Moy <Matthieu.Moy@imag.fr> wrote:

> Hi,
> 
> All is in the title ;-).
> 
> The command
> 
>   git svn clone (URL of an empty SVN repo here)
> 
> works, creates an empty git repository. I can perform the initial
> commit there, but then, "git svn dcommit" says :
> 
> Use of uninitialized value in concatenation (.) or string at /home/moy/local/usr/bin/git-svn line 414.
> Committing to  ...
> Unable to determine upstream SVN information from HEAD history
> 
> I guess a correct management of the initial commit in git-svn would be
> hard to implement, but at least, the error message can be improved.
> First step is something like the patch below, and better would be for
> "git svn clone" to warn that it won't be able to do much with the
> cloned repo.

Thanks Matthieu,

Acked-by: Eric Wong <normalperson@yhbt.net>

> diff --git a/git-svn.perl b/git-svn.perl
> index b864b54..9a70c1e 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -410,10 +410,12 @@ sub cmd_dcommit {
>         $head ||= 'HEAD';
>         my @refs;
>         my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
> -       print "Committing to $url ...\n";
> +       if ($url) {
> +               print "Committing to $url ...\n";
> +       }
>         unless ($gs) {
>                 die "Unable to determine upstream SVN information from ",
> -                   "$head history\n";
> +                   "$head history.\nPerhaps the repository is empty.";
>         }
>         my $last_rev;
>         my ($linear_refs, $parents) = linearize_history($gs, \@refs);
> 

-- 
Eric Wong

Matthieu Moy· May 5, 2008, 08:18 UTC · re: Eric Wong · lore

[PATCH] Better error message for git svn dcommit on empty repository.

Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
 git-svn.perl |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index b864b54..9a70c1e 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -410,10 +410,12 @@ sub cmd_dcommit {
 	$head ||= 'HEAD';
 	my @refs;
 	my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
-	print "Committing to $url ...\n";
+	if ($url) {
+		print "Committing to $url ...\n";
+	}
 	unless ($gs) {
 		die "Unable to determine upstream SVN information from ",
-		    "$head history\n";
+		    "$head history.\nPerhaps the repository is empty.";
 	}
 	my $last_rev;
 	my ($linear_refs, $parents) = linearize_history($gs, \@refs);

-- 
1.5.5.1.72.gccbb6.dirty

Matthieu Moy· May 5, 2008, 09:13 UTC · re: Matthieu Moy · lore

Re: [PATCH] Better error message for git svn dcommit on empty repository.

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> Ideally, git-svn should be able to do the initial commit, but since it
> isn't, this patch makes it give an accurate error message.

Oops, I just noticed that the patch had already been applied.

Sorry for the noise.

-- 
Matthieu