X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiMirror.pm;h=d6aca800d479298b71d363241a4d0ebf71c8f957;hp=21341efb99ab32d85f2a008767c974de4d3356b3;hb=d58adce592aa4fa719d095b6f3f05665a2f7b394;hpb=4bc708478281771874bb23b88b9a04b70dddac78

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 21341efb..d6aca800 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -375,7 +375,7 @@ sub fgrp_fetched {
 sub fgrp_fetch {
 	my ($fgrp, $fini) = @_;
 	my $cmd = [ @{$fgrp->{-torsocks}}, 'git', "--git-dir=$fgrp->{-osdir}",
-			fetch_args($fgrp->{lei}, my $opt = {}),
+			fetch_args($fgrp->{lei}, my $opt = {}), '--no-tags',
 			$fgrp->{-remote} ];
 	$fgrp->{-fini} = $fini;
 	do_reap($fgrp);
@@ -405,7 +405,9 @@ sub forkgroup_prep {
 	my $key = $self->{-key} // die 'BUG: no -key';
 	my ($bn) = ($key =~ m{/([a-z0-9_,;=!\+\{\}\|][^/]*)(?:\.git)?\z}i);
 	my $rn = "$bn-".substr(sha256_hex($key), 0, 16);
-	for ("url=$uri", "fetch=+refs/*:refs/remotes/$rn/*") {
+	# --no-tags is required to avoid conflicts
+	for ("url=$uri", "fetch=+refs/*:refs/remotes/$rn/*",
+			'tagopt=--no-tags') {
 		my @kv = split(/=/, $_, 2);
 		$kv[0] = "remote.$rn.$kv[0]";
 		run_die([@cmd, @kv], undef, $opt);