Re: [PATCH v3 2/7] Add output_prefix_length to diff_options
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2012, 18:48 UTC
- Message-ID
- <7vsjg3tsvv.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1334573095-32286-3-git-send-email-lucian.poston@gmail.com>
Lucian Poston <lucian.poston@gmail.com> writes:
Show 8 quoted lines
> Add output_prefix_length to diff_options. Initialize the value to 0 and only > set it when graph.c:diff_output_prefix_callback() is called. > > Signed-off-by: Lucian Poston <lucian.poston@gmail.com> > --- > diff.h | 1 + > graph.c | 3 +++ > 2 files changed, 4 insertions(+), 0 deletions(-)
This patch is a no-op, as nobody pays attention to the value this field contains. I think it is better to squash this with 3/7 where you introduce the only user of this field.
Also when that happens, you would need to adjust the test vector, which may mean that you need to squash the result with 4/7 as well.
Show 35 quoted lines
> diff --git a/diff.h b/diff.h
> index cb68743..19d762f 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -150,6 +150,7 @@ struct diff_options {
> diff_format_fn_t format_callback;
> void *format_callback_data;
> diff_prefix_fn_t output_prefix;
> + int output_prefix_length;
> void *output_prefix_data;
> };
>
> diff --git a/graph.c b/graph.c
> index 7358416..7e0a099 100644
> --- a/graph.c
> +++ b/graph.c
> @@ -194,8 +194,10 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void
> struct git_graph *graph = data;
> static struct strbuf msgbuf = STRBUF_INIT;
>
> + assert(opt);
> assert(graph);
>
> + opt->output_prefix_length = graph->width;
> strbuf_reset(&msgbuf);
> graph_padding_line(graph, &msgbuf);
> return &msgbuf;
> @@ -245,6 +247,7 @@ struct git_graph *graph_init(struct rev_info *opt)
> */
> opt->diffopt.output_prefix = diff_output_prefix_callback;
> opt->diffopt.output_prefix_data = graph;
> + opt->diffopt.output_prefix_length = 0;
>
> return graph;
> }