Skip to contentSkip to conversation

git-svn but with blank commits and author file

PATCH Thomas Guyot-Sionnest 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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

When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch breaks 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 this morning against Git's HEAD.

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

Thanks,

- --
Thomas Guyot
[email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFICpHo6dZ+Kt5BchYRAltpAJ4mPuN+uhucMpvDbXVKLfb2IzBIXQCghnf6 NoPN55yRj0eIhDowvWTQ0r4=
=48zw
-----END PGP SIGNATURE-----

git-svn.perl renamed from git-svn.perl.orig +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;