diff options
| author | Aaron Schrab <aaron@schrab.com> | 2018-07-16 06:59:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 20:04:56 +0200 |
| commit | 02cfd149207f65dd8462ed90c505c90af8655fc9 (patch) | |
| tree | b65f82ea0acb647b92bc6d3cb37522aa227d0ad8 | |
| parent | First batch for 2.19 cycle (diff) | |
| download | git-02cfd149207f65dd8462ed90c505c90af8655fc9.tar.xz git-02cfd149207f65dd8462ed90c505c90af8655fc9.zip | |
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>
| -rw-r--r-- | sequencer.c | 2 |
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"); |