Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

From: Aaron Schrab <aaron@schrab.com>
Date: Jul 12, 2018, 03:02 UTC
Message-ID: <20180712030249.22071-1-aaron@schrab.com>
In-Reply-To: <e8973797-fc5f-2ca5-1881-5ee66fc8279b@living180.net>

Sorry for taking so long to get back to this. Hopefully the following will be acceptable to everyone.

8< -----

Subject: [PATCH v2] sequencer: use configured comment character

Use the configured comment character when generating comments about branches in a todo list. Failure to honor this configuration causes a failure to parse the resulting todo list.

Note that the comment_line_char has already been resolved by this point, even if the user has configured the comment character to be selected automatically.

Signed-off-by: Aaron Schrab <aaron@schrab.com>
---
 sequencer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sequencer.c b/sequencer.c
index 4034c0461b..caf91af29d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3991,7 +3991,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		entry = oidmap_get(&state.commit2label, &commit->object.oid);
 
 		if (entry)
-			fprintf(out, "\n# Branch %s\n", entry->string);
+			fprintf(out, "\n%c Branch %s\n", comment_line_char, entry->string);
 		else
 			fprintf(out, "\n");

-- 
2.18.0.419.gfe4b301394