[PATCH 4/6] sequencer: avoid empty lines after 'update-ref' instructions

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Sep 30, 2022, 14:09 UTC
Message-ID: <20220930140948.80367-5-szeder.dev@gmail.com>
In-Reply-To: <20220930140948.80367-1-szeder.dev@gmail.com>

When the sequencer generates a todo list for 'git rebase --update-refs', it always inserts an empty line after each 'update-ref' instruction and after each comment line about checked out refs. These empty lines are unnecessary, distracting, and waste valuable vertical screen real estate, especially when multiple refs point to the same commit:

  pick 29a79f8 two
  pick 74bf293 three
  # Ref refs/heads/branch3 checked out at '/tmp/test/WT'

  update-ref refs/heads/branch2

  update-ref refs/heads/branch1

  pick 5f59b82 four

Eliminate those empty lines.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
 sequencer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index d26ede83c4..fba92c90b1 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -5945,12 +5945,12 @@ 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",
+			strbuf_addf(ctx->buf, "# Ref %s checked out at '%s'",
 				    decoration->name, path);
 		} else {
 			struct string_list_item *sti;
 			item->command = TODO_UPDATE_REF;
-			strbuf_addf(ctx->buf, "%s\n", decoration->name);
+			strbuf_addstr(ctx->buf, decoration->name);
 
 			sti = string_list_insert(&ctx->refs_to_oids,
 						 decoration->name);

-- 
2.38.0.rc2.542.g9b62912f7f