From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Cc: Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output
Date: Thu, 18 Aug 2016 11:26:03 -0700 [thread overview]
Message-ID: <20160818182603.10772-1-jacob.e.keller@intel.com> (raw)
In-Reply-To: <CAGZ79kZeSwteU84-=GZ0cZDCJUf6=VrGzAiNqC_gx7DgTQX-8Q@mail.gmail.com>
From: Jacob Keller <jacob.keller@gmail.com>
On Thu, Aug 18, 2016 at 10:56 AM, Stefan Beller <sbeller@google.com> wrote:
> On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller <jacob.e.keller@intel.com> wrote:
>> From: Jacob Keller <jacob.keller@gmail.com>
>> - /*
>> - * 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 <jacob.keller@gmail.com>
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 <jacob.keller@gmail.com>
---
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
next prev parent reply other threads:[~2016-08-19 1:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 0:51 [PATCH v7 0/7] implement inline submodule diff format Jacob Keller
2016-08-18 0:51 ` [PATCH v7 1/7] diff.c: remove output_prefix_length field Jacob Keller
2016-08-18 0:51 ` [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output Jacob Keller
2016-08-18 17:56 ` Stefan Beller
2016-08-18 18:26 ` Jacob Keller [this message]
2016-08-18 18:29 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 3/7] diff: prepare for additional submodule formats Jacob Keller
2016-08-18 18:03 ` Stefan Beller
2016-08-18 0:51 ` [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly Jacob Keller
2016-08-18 18:06 ` Stefan Beller
2016-08-18 18:46 ` Junio C Hamano
2016-08-18 18:50 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 5/7] submodule: correct output of submodule log format Jacob Keller
2016-08-18 18:25 ` Stefan Beller
2016-08-18 18:34 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function Jacob Keller
2016-08-18 7:00 ` David Aguilar
2016-08-18 7:37 ` Jacob Keller
2016-08-18 19:04 ` Stefan Beller
2016-08-18 20:24 ` Jacob Keller
2016-08-18 20:39 ` Stefan Beller
2016-08-18 20:44 ` Jacob Keller
2016-08-18 20:49 ` Junio C Hamano
2016-08-18 21:08 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff Jacob Keller
2016-08-18 19:47 ` Stefan Beller
2016-08-18 20:13 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160818182603.10772-1-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).