Skip to contentSkip to conversation

git-svn bug with blank commits and author file

PATCH In review Thomas Guyot-Sionnest 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git-svn bug with blank commits and author file

-----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
[email protected]
-----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 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;
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Thomas Guyot-Sionnest

-----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.

Quoted 7 lines

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

Quoted 25 lines

- --
Thomas Guyot
[email protected]
-----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 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;