Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Schrab <aaron@schrab.com>2018-07-16 07:59:02 +0300
committerJunio C Hamano <gitster@pobox.com>2018-07-16 21:04:56 +0300
commit02cfd149207f65dd8462ed90c505c90af8655fc9 (patch)
treeb65f82ea0acb647b92bc6d3cb37522aa227d0ad8 /sequencer.c
parented843436dd4924c10669820cc73daf50f0b4dabd (diff)
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. Setting core.commentChar to "auto" will not be honored here, and the previously configured or default value will be used instead. But, since the todo list will consist of only generated content, there should not be any non-comment lines beginning with that character. Signed-off-by: Aaron Schrab <aaron@schrab.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 5354d4d51e..c80de6ceac 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3994,7 +3994,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");