X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwListing.pm;h=03534f03e670c6b92e5da18ab4975984fe88a6ed;hb=9a306585752349cc0508135ecb11d1cb6a7d7f8f;hp=e2724cc49e631dc63a38dc26410d0b6a9577707b;hpb=0886c264b24b8bc7626e5a7eb59598b0229f066d;p=public-inbox.git

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index e2724cc4..03534f03 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -96,7 +96,7 @@ sub html ($$) {
 		$title .= ' - listing';
 		$code = 200;
 
-		# Swartzian transform since ->modified is expensive
+		# Schwartzian transform since Inbox->modified is expensive
 		@$list = sort {
 			$b->[0] <=> $a->[0]
 		} map { [ $_->modified, $_ ] } @$list;
@@ -138,10 +138,10 @@ sub fingerprint ($) {
 	$dig->hexdigest;
 }
 
-sub manifest_add ($$;$) {
-	my ($manifest, $ibx, $epoch) = @_;
+sub manifest_add ($$;$$) {
+	my ($manifest, $ibx, $epoch, $default_desc) = @_;
 	my $url_path = "/$ibx->{name}";
-	my $git_dir = $ibx->{mainrepo};
+	my $git_dir = $ibx->{inboxdir};
 	if (defined $epoch) {
 		$git_dir .= "/git/$epoch.git";
 		$url_path .= "/git/$epoch.git";
@@ -155,6 +155,13 @@ sub manifest_add ($$;$) {
 	$owner = undef if $owner eq '';
 	$desc = 'Unnamed repository' if $desc eq '';
 
+	# templates/hooks--update.sample and git-multimail in git.git
+	# only match "Unnamed repository", not the full contents of
+	# templates/this--description in git.git
+	if ($desc =~ /\AUnnamed repository/) {
+		$desc = "$default_desc [epoch $epoch]" if defined($epoch);
+	}
+
 	my $reference;
 	chomp(my $alt = try_cat("$git_dir/objects/info/alternates"));
 	if ($alt) {
@@ -190,9 +197,10 @@ sub js ($$) {
 
 	my $manifest = { -abs2urlpath => {}, -mtime => 0 };
 	for my $ibx (@$list) {
-		if (defined(my $max = $ibx->max_git_part)) {
+		if (defined(my $max = $ibx->max_git_epoch)) {
+			my $desc = $ibx->description;
 			for my $epoch (0..$max) {
-				manifest_add($manifest, $ibx, $epoch);
+				manifest_add($manifest, $ibx, $epoch, $desc);
 			}
 		} else {
 			manifest_add($manifest, $ibx);