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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Kristoffer

On 31/10/2024 10:07, Kristoffer Haugsbakk wrote:
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@xxxxxxxxxxxx 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@xxxxxxxxx/T/#mf299f1ac7bdb772b396068200d32b5fac669fb55

Oh, sorry I'd missed that message.

Best Wishes

Phillip

Cheers :)

Kristoffer





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux