From: Jacob Keller Date: Thu, 18 Aug 2016 18:26:03 GMT Subject: Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output Message-ID: <20160818182603.10772-1-jacob.e.keller@intel.com> In-Reply-To: From: Jacob Keller On Thu, Aug 18, 2016 at 10:56 AM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: >> From: Jacob Keller >> - /* >> - * Add a newline after the commit message. >> - * >> - * Usually, this newline produces a blank >> - * padding line between entries, in which case >> - * we need to add graph padding on this line. >> - * >> - * However, the commit message may not end in a >> - * newline. In this case the newline simply >> - * ends the last line of the commit message, >> - * and we don't need any graph output. (This >> - * always happens with CMIT_FMT_ONELINE, and it >> - * happens with CMIT_FMT_USERFORMAT when the >> - * format doesn't explicitly end in a newline.) >> - */ >> - if (buf.len && buf.buf[buf.len - 1] == '\n') >> - graph_show_padding(revs->graph); >> - putchar('\n'); >> - } else { >> - /* >> - * If the message buffer is empty, just show >> - * the rest of the graph output for this >> - * commit. >> - */ >> - if (graph_show_remainder(revs->graph)) >> - putchar('\n'); >> - if (revs->commit_format == CMIT_FMT_ONELINE) >> - putchar('\n'); >> - } >> + /* >> + * Add a newline after the commit message. > > I wondered if it is my webmailer displaying things wrongly here so I checked > it at public inbox, and fetched the mails and applied them. > > It seems to me as if this long comment is broken in indentation > (i.e. you removed a blank ' ' directly in front of the '*' instead of a '\t' ?) > Yea it is indeed broken. Something like the following squash should fix it. We could also re-flow the text if desired too, but I don't really see the advantage. 8<----- From 345bbaa47cc14aba7049738e99c3649e2c06748c Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Thu, 18 Aug 2016 11:13:04 -0700 Subject: [PATCH] SQUASH: fix indentation of comment in builtin/rev-list.c Signed-off-by: Jacob Keller --- builtin/rev-list.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 1a75a83538f4..21cde8dd6b31 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -129,20 +129,20 @@ static void show_commit(struct commit *commit, void *data) graph_show_commit_msg(revs->graph, stdout, &buf); /* - * Add a newline after the commit message. - * - * Usually, this newline produces a blank - * padding line between entries, in which case - * we need to add graph padding on this line. - * - * However, the commit message may not end in a - * newline. In this case the newline simply - * ends the last line of the commit message, - * and we don't need any graph output. (This - * always happens with CMIT_FMT_ONELINE, and it - * happens with CMIT_FMT_USERFORMAT when the - * format doesn't explicitly end in a newline.) - */ + * Add a newline after the commit message. + * + * Usually, this newline produces a blank + * padding line between entries, in which case + * we need to add graph padding on this line. + * + * However, the commit message may not end in a + * newline. In this case the newline simply + * ends the last line of the commit message, + * and we don't need any graph output. (This + * always happens with CMIT_FMT_ONELINE, and it + * happens with CMIT_FMT_USERFORMAT when the + * format doesn't explicitly end in a newline.) + */ if (buf.len && buf.buf[buf.len - 1] == '\n') graph_show_padding(revs->graph); putchar('\n'); -- 2.10.0.rc0.217.g609f9e8.dirty