{"thread":{"id":"48793","subject":"[PATCH] sequencer: use configured comment character","startedAt":"2018-06-28T02:04:37Z","lastAt":"2018-06-29T15:56:20Z","messageCount":5,"participants":["Aaron Schrab","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"351181","messageId":"20180628020414.25036-1-aaron@schrab.com","threadId":"48793","inReplyTo":null,"subject":"[PATCH] sequencer: use configured comment character","fromName":"Aaron Schrab","fromEmail":"aaron@schrab.com","sentAt":"2018-06-28T02:04:14Z","receivedAt":"2018-06-28T02:04:37Z","isPatch":true,"sender":{"key":"aaron@schrab.com","avatar":"https://avatars.githubusercontent.com/u/39620?v=4"},"body":"Use configured comment character when generating comments about branches\nin an instruction sheet. Failure to honor this configuration causes a\nfailure to parse the resulting instruction sheet.\n\nSigned-off-by: Aaron Schrab \n---\n sequencer.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 4034c0461b..caf91af29d 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -3991,7 +3991,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,\n \t\tentry = oidmap_get(&state.commit2label, &commit->object.oid);\n \n \t\tif (entry)\n-\t\t\tfprintf(out, \"\\n# Branch %s\\n\", entry->string);\n+\t\t\tfprintf(out, \"\\n%c Branch %s\\n\", comment_line_char, entry->string);\n \t\telse\n \t\t\tfprintf(out, \"\\n\");\n \n-- \n2.18.0.419.gfe4b301394\n\n"},{"id":"351194","messageId":"nycvar.QRO.7.76.6.1806281157110.73@tvgsbejvaqbjf.bet","threadId":"48793","inReplyTo":"20180628020414.25036-1-aaron@schrab.com","subject":"Re: [PATCH] sequencer: use configured comment character","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-28T09:57:59Z","receivedAt":"2018-06-28T09:58:39Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Aaron,\n\nOn Wed, 27 Jun 2018, Aaron Schrab wrote:\n\n> Use configured comment character when generating comments about branches\n> in an instruction sheet. Failure to honor this configuration causes a\n> failure to parse the resulting instruction sheet.\n\nGood catch.\n\nNow, if you can refer to the \"todo list\" as \"todo list\" (or \"todo script\"\nif you must) instead of an \"instruction sheet\", you have my ACK.\n\nCiao,\nJohannes\n"},{"id":"351259","messageId":"xmqqh8lmwsso.fsf@gitster-ct.c.googlers.com","threadId":"48793","inReplyTo":"20180628020414.25036-1-aaron@schrab.com","subject":"Re: [PATCH] sequencer: use configured comment character","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-28T20:38:15Z","receivedAt":"2018-06-28T20:38:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Aaron Schrab writes:\n\n> Use configured comment character when generating comments about branches\n> in an instruction sheet. Failure to honor this configuration causes a\n> failure to parse the resulting instruction sheet.\n>\n> Signed-off-by: Aaron Schrab \n> ---\n> sequencer.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/sequencer.c b/sequencer.c\n> index 4034c0461b..caf91af29d 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -3991,7 +3991,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,\n> \t\tentry = oidmap_get(&state.commit2label, &commit->object.oid);\n> \n> \t\tif (entry)\n> -\t\t\tfprintf(out, \"\\n# Branch %s\\n\", entry->string);\n> +\t\t\tfprintf(out, \"\\n%c Branch %s\\n\", comment_line_char, entry->string);\n> \t\telse\n> \t\t\tfprintf(out, \"\\n\");\n\nWould this interact OK with core.commentchar set to \"auto\"?\n"},{"id":"351335","messageId":"nycvar.QRO.7.76.6.1806291607501.74@tvgsbejvaqbjf.bet","threadId":"48793","inReplyTo":"xmqqh8lmwsso.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] sequencer: use configured comment character","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-29T14:12:00Z","receivedAt":"2018-06-29T14:12:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> Aaron Schrab writes:\n> \n> > Use configured comment character when generating comments about branches\n> > in an instruction sheet. Failure to honor this configuration causes a\n> > failure to parse the resulting instruction sheet.\n> >\n> > Signed-off-by: Aaron Schrab \n> > ---\n> > sequencer.c | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/sequencer.c b/sequencer.c\n> > index 4034c0461b..caf91af29d 100644\n> > --- a/sequencer.c\n> > +++ b/sequencer.c\n> > @@ -3991,7 +3991,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,\n> > \t\tentry = oidmap_get(&state.commit2label, &commit->object.oid);\n> > \n> > \t\tif (entry)\n> > -\t\t\tfprintf(out, \"\\n# Branch %s\\n\", entry->string);\n> > +\t\t\tfprintf(out, \"\\n%c Branch %s\\n\", comment_line_char, entry->string);\n> > \t\telse\n> > \t\t\tfprintf(out, \"\\n\");\n> \n> Would this interact OK with core.commentchar set to \"auto\"?\n\nThe idea of \"auto\" is:\n\n\tIf set to \"auto\", `git-commit` would select a character that is not\n\tthe beginning character of any line in existing commit messages.\n\nAs there are no pre-existing lines in that script (apart from the ones we\nare about to add with the todo_help), the setting \"auto\" is pretty moot\nand we will fall back to the default comment char (or, if there was a\nprevious core.commentChar that was parsed, that one).\n\nIn short: the code is fine, but yes, I had to convince myself by looking\nthrough the code. (Hinting at a possible improvement of the commit\nmessage.)\n\nCiao,\nDscho\n"},{"id":"351343","messageId":"xmqq8t6xwpr7.fsf@gitster-ct.c.googlers.com","threadId":"48793","inReplyTo":"nycvar.QRO.7.76.6.1806291607501.74@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] sequencer: use configured comment character","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-29T15:56:12Z","receivedAt":"2018-06-29T15:56:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> In short: the code is fine, but yes, I had to convince myself by looking\n> through the code. (Hinting at a possible improvement of the commit\n> message.)\n\nYup, that exactly was what I was hoping readers to realize.\n"}]}