From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
	autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 355EB1F4B8
	for <meta@public-inbox.org>; Mon,  7 Oct 2024 08:29:59 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org;
	s=selector1; t=1728289799;
	bh=uVzTxNfgXAnbim3QI8IehiwfgbNDIHfQmjvRO4jK6T4=;
	h=Date:From:To:Subject:References:In-Reply-To:From;
	b=ZlGuETA/GN+nbQ11y/w/NgvhWbCBQQPf7iy9HXqh+dp9UNdHbRDrHpUVF4ERq2SUN
	 Bt6FgHIs1yIrYWQ+Fc9qWT8wrvuoNDUQBKPic/YNtL710E0b6n8xeqKze31GmVwLep
	 PVTC0S69Fhp7GcOSqJ/KzDNpf7ycLcKg9+IQcFis=
Date: Mon, 7 Oct 2024 08:29:58 +0000
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: Re: [PATCH v2 3/3] viewvcs: generate search query for merge commits
Message-ID: <20241007082959.M2843@dcvr>
References: <20241002194448.4123393-1-e@80x24.org>
 <20241002223902.4139389-4-e@80x24.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20241002223902.4139389-4-e@80x24.org>
List-Id: <meta.public-inbox.org>

Eric Wong <e@80x24.org> wrote:
> @@ -275,7 +305,10 @@ committer $co
>  
>  <b>$title_html</b>
>  EOM
> -	print $zfh "\n", $ctx->{-linkify}->to_html($bdy) if length($bdy);
> +	if (length($bdy)) {
> +		print $zfh "\n", $ctx->{-linkify}->to_html($bdy);
> +		$merge_titles = prep_merge_titles $bdy if $merge_titles;
> +	}

I squashed this in to handle blank commit messages for merges:

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 48a16c11..d9df671c 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -334,7 +334,7 @@ id=related><pre>find related emails, including ancestors/descendants/conflicts
 />\t(<a href="${ibx_url}_/text/help/">help</a>)</pre></form>
 EOM
 	}
-	if ($merge_titles) {
+	if (ref $merge_titles) {
 		print $zfh <<EOM;
 <hr><form action="$ibx_url" id=merged><pre>find merged patch emails
 <textarea name=q cols=78