[PATCH 1/2] sequencer: fix --rebase-merges with custom commentChar

From: Daniel Harding <dharding@living180.net>
Date: Jul 8, 2018, 18:41 UTC
Message-ID: <20180708184110.14792-2-dharding@living180.net>
In-Reply-To: <20180708184110.14792-1-dharding@living180.net>

Prefix the "Branch <name>" comments in the todo list with the configured comment character instead of hard-coding '#'.

Signed-off-by: Daniel Harding <dharding@living180.net>
---
 sequencer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sequencer.c b/sequencer.c
index 4034c0461..caf91af29 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