[PATCH] git-svn bug with blank commits and author file

Thomas Guyot-Sionnest· Apr 22, 2008, 10:07 UTC · lore

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

* Sorry for resending; added a patch tag and corrected typo in subject *

When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch changes this behavior and allow using the author file with blanks authors.

I came across this bug while importing from a cvs2svn repo where the initial revision (1) has a blank author. This doesn't break the behavior of bailing out when an unknown author is encountered.

The patch was made against Git's HEAD.

If you reply please make sure to cc me as I'm not subscribed to the list.

Thanks,

- --
Thomas Guyot
dermoth@aei.ca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIDbjz6dZ+Kt5BchYRAjdFAJ0WA9TiIJ6tefjaPkd40Y2Tjv6NPACbBwmB a6eFU84MpJ9MW1nErxDiqHY= =k3jA -----END PGP SIGNATURE-----

--- git-svn.perl.orig 2008-04-19 05:58:10.000000000 -0400 +++ git-svn.perl 2008-04-19 19:50:40.000000000 -0400

Show changes to diff +1 −2

@@ -2375,8 +2375,7 @@
 	my ($author) = @_;
 	if (!defined $author || length $author == 0) {
 		$author = '(no author)';
-	}
-	if (defined $::_authors && ! defined $::users{$author}) {
+	} elsif (defined $::_authors && ! defined $::users{$author}) {
 		die "Author: $author not defined in $::_authors file\n";
 	}
 	$author;

Eric Wong· Apr 22, 2008, 23:23 UTC · re: Thomas Guyot-Sionnest · lore

Re: [PATCH] git-svn bug with blank commits and author file

Thomas Guyot-Sionnest <dermoth@aei.ca> wrote:

Show 16 quoted lines

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> * Sorry for resending; added a patch tag and corrected typo in subject *
> 
> When trying to import from svn using an author file, git-svn bails out
> if it encounters a blank author. The attached patch changes this
> behavior and allow using the author file with blanks authors.
> 
> I came across this bug while importing from a cvs2svn repo where the
> initial revision (1) has a blank author. This doesn't break the behavior
> of bailing out when an unknown author is encountered.
> 
> The patch was made against Git's HEAD.
> 
> If you reply please make sure to cc me as I'm not subscribed to the list.

Thank you Thomas,

Sorry for the latency, I've been overloaded

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

Show 11 quoted lines

> - --
> Thomas Guyot
> dermoth@aei.ca
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> 
> iD8DBQFIDbjz6dZ+Kt5BchYRAjdFAJ0WA9TiIJ6tefjaPkd40Y2Tjv6NPACbBwmB
> a6eFU84MpJ9MW1nErxDiqHY=
> =k3jA
> -----END PGP SIGNATURE-----

Show 13 quoted lines

> --- git-svn.perl.orig	2008-04-19 05:58:10.000000000 -0400
> +++ git-svn.perl	2008-04-19 19:50:40.000000000 -0400
> @@ -2375,8 +2375,7 @@
>  	my ($author) = @_;
>  	if (!defined $author || length $author == 0) {
>  		$author = '(no author)';
> -	}
> -	if (defined $::_authors && ! defined $::users{$author}) {
> +	} elsif (defined $::_authors && ! defined $::users{$author}) {
>  		die "Author: $author not defined in $::_authors file\n";
>  	}
>  	$author;
>

patchgit-svn bug with blank commits and author file