Git development
 help / color / mirror / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Git List <git@vger.kernel.org>
Cc: Jeff King <peff@peff.net>
Subject: Re: [PATCH] trailer: change strbuf in-place in unfold_value()
Date: Fri, 15 May 2026 08:47:25 +0200	[thread overview]
Message-ID: <0b673b25-1f0e-44f5-b24c-7f7183d58cee@web.de> (raw)
In-Reply-To: <a4da346d-3800-40ea-8828-970b15088bf3@ramsayjones.plus.com>

On 5/14/26 11:30 PM, Ramsay Jones wrote:
> 
>> diff --git a/trailer.c b/trailer.c
>> index 470f86a4a2..b89fa12fe7 100644
>> --- a/trailer.c
>> +++ b/trailer.c
>> @@ -988,29 +988,25 @@ static int ends_with_blank_line(const char *buf, size_t len)
>>  
>>  static void unfold_value(struct strbuf *val)
>>  {
>> -	struct strbuf out = STRBUF_INIT;
>>  	size_t i;
>> +	size_t pos = 0;
>>  
>> -	strbuf_grow(&out, val->len);
>>  	i = 0;
>>  	while (i < val->len) {
>>  		char c = val->buf[i++];
>>  		if (c == '\n') {
>>  			/* Collapse continuation down to a single space. */
>>  			while (i < val->len && isspace(val->buf[i]))
>>  				i++;
>> -			strbuf_addch(&out, ' ');
>> -		} else {
>> -			strbuf_addch(&out, c);
>> +			val->buf[pos++] = ' ';
>> +		} else if (pos != i) {
> 
> Hmm, isn't 'pos' strictly (always) less than 'i' here? (note the post update
> of 'i' when setting 'c' at the head of the loop).

Ah, yes, good find.  Initially I used a for loop which incremented i
only at the end, but converted it back to minimize the patch and
forgot to adjust this comparison.

René


  parent reply	other threads:[~2026-05-15  6:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-14 18:40 [PATCH] trailer: change strbuf in-place in unfold_value() René Scharfe
2026-05-14 21:30 ` Ramsay Jones
2026-05-15  4:44   ` Jeff King
2026-05-15  6:47   ` René Scharfe [this message]
2026-05-15  4:47 ` Jeff King
2026-05-15  7:33 ` [PATCH v2] " René Scharfe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0b673b25-1f0e-44f5-b24c-7f7183d58cee@web.de \
    --to=l.s.r@web.de \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox