From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Allan Caffee <allan.caffee@gmail.com>,
Jeff King <peff@peff.net>, Nanako Shiraishi <nanako3@lavabit.com>
Subject: Re: [PATCH 1/2] graph.c: avoid compile warnings
Date: Mon, 30 Mar 2009 08:58:42 -0700 [thread overview]
Message-ID: <7vd4bzf1e5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7ee8d1c4ca806ce964356a1fe78efac19d56c29b.1238428115u.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Mon, 30 Mar 2009 17:49:36 +0200 (CEST)")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>
> I'd actually like to see this and the next patch squashed in.
>
> graph.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/graph.c b/graph.c
> index 2929c8b..5e2f224 100644
> --- a/graph.c
> +++ b/graph.c
> @@ -701,8 +701,8 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
> for (i = 0; i < graph->num_columns; i++) {
> struct column *col = &graph->columns[i];
> if (col->commit == graph->commit) {
> - seen_this = 1;
> struct strbuf tmp = STRBUF_INIT;
> + seen_this = 1;
Which codebase are you working on top of?
> strbuf_addf(&tmp, "| %*s", graph->expansion_row, "");
> strbuf_write_column(sb, col, tmp.buf);
> strbuf_release(&tmp);
> @@ -921,8 +921,6 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
> {
> int i;
> int *tmp_mapping;
> - static int collapsing_columns[255];
> - int collapsing_seen_so_far = 0;
>
> /*
> * Clear out the new_mapping array
> --
> 1.6.2.1.493.g67cf3
next prev parent reply other threads:[~2009-03-30 16:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-18 10:05 [RFC] Colorization of log --graph Allan Caffee
2009-03-18 11:44 ` Johannes Schindelin
2009-03-19 16:59 ` Allan Caffee
2009-03-19 17:41 ` Johannes Schindelin
2009-03-19 21:48 ` Nanako Shiraishi
2009-03-20 19:13 ` Allan Caffee
2009-03-20 19:58 ` Jeff King
[not found] ` <20090321175726.GA6677@linux.vnet>
2009-03-30 14:13 ` [RFC/PATCH] graph API: Added logic for colored edges Allan Caffee
[not found] ` <cover.1238428115u.git.johannes.schindelin@gmx.de>
2009-03-30 15:49 ` [PATCH 1/2] graph.c: avoid compile warnings Johannes Schindelin
2009-03-30 15:58 ` Junio C Hamano [this message]
2009-03-30 16:14 ` Junio C Hamano
2009-03-30 15:49 ` [PATCH 2/2] --graph: respect --no-color Johannes Schindelin
2009-03-30 16:04 ` [RFC/PATCH] graph API: Added logic for colored edges Johannes Schindelin
2009-03-31 10:13 ` Johannes Schindelin
2009-03-31 10:26 ` Johannes Sixt
2009-03-31 12:09 ` Johannes Schindelin
2009-03-31 10:21 ` Johannes Schindelin
2009-03-20 20:13 ` [RFC] Colorization of log --graph Junio C Hamano
2009-03-18 16:52 ` Eric Raible
2009-03-18 17:04 ` Santi Béjar
2009-03-18 17:29 ` Eric Raible
2009-03-19 19:32 ` Markus Heidelberg
2009-03-19 19:52 ` Eric Raible
2009-03-19 20:04 ` Markus Heidelberg
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=7vd4bzf1e5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=allan.caffee@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=nanako3@lavabit.com \
--cc=peff@peff.net \
/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).