git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer: comment checked-out branch properly

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Oct 31, 2024, 16:30 UTC
Message-ID
<e1928475-7e11-4e74-92da-fe6768ccabca@gmail.com>
In-Reply-To
<9c29cb98-541b-4a18-9936-81477c7c13ab@app.fastmail.com>
Hi Kristoffer
On 31/10/2024 10:07, Kristoffer Haugsbakk wrote:
Show 31 quoted lines
> On Thu, Oct 31, 2024, at 10:58, Phillip Wood wrote:
>> On 23/10/2024 19:44, Taylor Blau wrote:
>>> On Wed, Oct 23, 2024 at 07:27:58PM +0200, kristofferhaugsbakk@fastmail.com wrote:
>>>> @@ -6382,8 +6382,9 @@ static int add_decorations_to_list(const struct commit *commit,
>>>>    		/* If the branch is checked out, then leave a comment instead. */
>>>>    		if ((path = branch_checked_out(decoration->name))) {
>>>>    			item->command = TODO_COMMENT;
>>>> -			strbuf_addf(ctx->buf, "# Ref %s checked out at '%s'\n",
>>>> -				    decoration->name, path);
>>>> +			strbuf_commented_addf(ctx->buf, comment_line_str,
>>>> +					      "Ref %s checked out at '%s'\n",
>>>> +					      decoration->name, path);
>>>
>>> Makes sense, but the following command turns up a couple more results
>>> even after applying:
>>>
>>>       $ git grep -p 'strbuf_addf([^,]*, "#'
>>>       sequencer.c=static void update_squash_message_for_fixup(struct strbuf *msg)
>>>       sequencer.c:    strbuf_addf(&buf1, "# %s\n", _(first_commit_msg_str));
>>>       sequencer.c:    strbuf_addf(&buf2, "# %s\n", _(skip_first_commit_msg_str));
>>
>> Good find - it's surprising that those have survived so long without
>> anyone complaining. There is also
>>
>> 	"# *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***",
>>
>> in do_pick_commit()
> 
> I’m including an update to “say why” in the next version.
> 
> Those others look correct to me: https://lore.kernel.org/git/c05e603f-1fd4-4ad2-ba03-21269f464ed2@gmail.com/T/#mf299f1ac7bdb772b396068200d32b5fac669fb55
Oh, sorry I'd missed that message.
Best Wishes
Phillip
> Cheers :)
> 
> Kristoffer
Previous: Kristoffer HaugsbakkNext: Taylor Blau
Message 9 of 42 in “sequencer: comment checked-out branch properly”
  1. sequencer: comment checked-out branch properlykristofferhaugsbakk@fastmail.com, Oct 23, 2024
  2. Taylor BlauOct 23, 2024
  3. Kristoffer HaugsbakkOct 23, 2024
  4. Phillip WoodOct 31, 2024
  5. Kristoffer HaugsbakkOct 31, 2024
  6. phillip.wood123@gmail.comOct 31, 2024
  7. Phillip WoodOct 31, 2024
  8. Kristoffer HaugsbakkOct 31, 2024
  9. Phillip WoodOct 31, 2024
  10. Taylor BlauOct 23, 2024
  11. Kristoffer HaugsbakkOct 23, 2024
  12. 0/3 sequencer: comment out properly in todo listkristofferhaugsbakk@fastmail.com, Nov 12, 2024
  13. 1/3 sequencer: comment checked-out branch properlykristofferhaugsbakk@fastmail.com, Nov 12, 2024
  14. Junio C HamanoNov 13, 2024
  15. Junio C HamanoNov 13, 2024
  16. phillip.wood123@gmail.comNov 13, 2024
  17. Junio C HamanoNov 13, 2024
  18. Kristoffer HaugsbakkNov 24, 2024
  19. 2/3 sequencer: comment `--reference` subject line properlykristofferhaugsbakk@fastmail.com, Nov 12, 2024
  20. Junio C HamanoNov 13, 2024
  21. phillip.wood123@gmail.comNov 13, 2024
  22. Junio C HamanoNov 13, 2024
  23. 3/3 sequencer: comment commit messages properlykristofferhaugsbakk@fastmail.com, Nov 12, 2024
  24. Junio C HamanoNov 13, 2024
  25. phillip.wood123@gmail.comNov 13, 2024
  26. Kristoffer HaugsbakkNov 24, 2024
  27. Junio C HamanoNov 13, 2024
  28. Kristoffer HaugsbakkNov 24, 2024
  29. 0/3 sequencer: comment out properly in todo listkristofferhaugsbakk@fastmail.com, Nov 24, 2024
  30. 1/3 sequencer: comment checked-out branch properlykristofferhaugsbakk@fastmail.com, Nov 24, 2024
  31. 2/3 sequencer: comment `--reference` subject line properlykristofferhaugsbakk@fastmail.com, Nov 24, 2024
  32. 3/3 sequencer: comment commit messages properlykristofferhaugsbakk@fastmail.com, Nov 24, 2024
  33. phillip.wood123@gmail.comNov 25, 2024
  34. Kristoffer HaugsbakkNov 25, 2024
  35. phillip.wood123@gmail.comNov 25, 2024
  36. 0/3 sequencer: comment out properly in todo listkristofferhaugsbakk@fastmail.com, Nov 25, 2024
  37. 1/3 sequencer: comment checked-out branch properlykristofferhaugsbakk@fastmail.com, Nov 25, 2024
  38. 2/3 sequencer: comment `--reference` subject line properlykristofferhaugsbakk@fastmail.com, Nov 25, 2024
  39. 3/3 sequencer: comment commit messages properlykristofferhaugsbakk@fastmail.com, Nov 25, 2024
  40. Junio C HamanoNov 26, 2024
  41. Phillip WoodNov 26, 2024
  42. Kristoffer HaugsbakkNov 27, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.